make MagicSmoke compatible with new include mode of libs

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@592 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/Makefile.mingw b/Makefile.mingw
index bc09d08..da785e6 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -50,8 +50,8 @@ client: wob zip qwbase tzone
        cd src && $(MAKE)
 
 zip:
-       cd zip && $(QMAKE) $(QOPT)
-       cd zip && $(MAKE)
+       cd zip/src && $(QMAKE) $(QOPT)
+       cd zip/src && $(MAKE)
 
 qwbase:
        cd pack/qtbase && $(QMAKE) $(QOPT)

diff --git a/Makefile.unix b/Makefile.unix
index 3527525..13e9e86 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -47,7 +47,7 @@ client: wob zip wbase tzone
        cd src ; $(QMAKE) && $(MAKE)
 
 zip:
-       cd zip ; $(QMAKE) && $(MAKE)
+       cd zip/src ; $(QMAKE) && $(MAKE)
 
 tzone:
        cd tzone ; $(QMAKE) && $(MAKE)

diff --git a/README b/README
index 7e1eb8c..21e8a47 100644 (file)
--- a/README
+++ b/README
@@ -17,9 +17,13 @@ See the Debian README for server installation.
 Copyrights
 -----------
 
+MagicSmoke itself is copyrighted by
 (c) Konrad Rosenbaum, 2007-2010
 (c) Peter Keller, 2007/8
 
+There are several external sources that are used by MagicSmoke, which are 
+(partly or wholly) under different copyrights, see below.
+
 Documenation License
 - - - - - - - - - - -
 

diff --git a/src/dialogs/customerdlg.h b/src/dialogs/customerdlg.h
index 88775a6..6a5dacf 100644 (file)
--- a/src/dialogs/customerdlg.h
+++ b/src/dialogs/customerdlg.h
@@ -20,8 +20,8 @@
 #include <QList>
 #include <QScrollArea>
 
-#include "MOCustomerInfo.h"
-#include "MOCustomer.h"
+#include "MOCustomerInfo"
+#include "MOCustomer"
 
 class QLineEdit;
 class QListView;

diff --git a/src/dialogs/eventedit.cpp b/src/dialogs/eventedit.cpp
index 9a145f1..f45367a 100644 (file)
--- a/src/dialogs/eventedit.cpp
+++ b/src/dialogs/eventedit.cpp
@@ -12,7 +12,7 @@
 
 #include "eventedit.h"
 
-#include "tzdata.h"
+#include <TimeStamp>
 
 #include <QBoxLayout>
 #include <QCheckBox>
@@ -32,7 +32,7 @@
 #include <QTimer>
 
 #include "msinterface.h"
-#include "MTGetEvent.h"
+#include "MTGetEvent"
 #include "centbox.h"
 #include "pricecatdlg.h"
 

diff --git a/src/dialogs/eventedit.h b/src/dialogs/eventedit.h
index befb253..bf460ea 100644 (file)
--- a/src/dialogs/eventedit.h
+++ b/src/dialogs/eventedit.h
@@ -15,7 +15,7 @@
 
 #include <QDialog>
 
-#include "MOEvent.h"
+#include "MOEvent"
 
 class QCheckBox;
 class QDateTime;

diff --git a/src/dialogs/eventsummary.h b/src/dialogs/eventsummary.h
index 394297d..a788a5f 100644 (file)
--- a/src/dialogs/eventsummary.h
+++ b/src/dialogs/eventsummary.h
@@ -16,8 +16,8 @@
 #include <QDialog>
 #include <QMap>
 
-#include "MOOrder.h"
-#include "MOEvent.h"
+#include "MOOrder"
+#include "MOEvent"
 #include "odtrender.h"
 
 class QTableView;

diff --git a/src/dialogs/flagedit.cpp b/src/dialogs/flagedit.cpp
index 4fb2a24..4ab2085 100644 (file)
--- a/src/dialogs/flagedit.cpp
+++ b/src/dialogs/flagedit.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "flagedit.h"
-#include "MTGetValidFlags.h"
+#include "MTGetValidFlags"
 
 #include <QBoxLayout>
 #include <QComboBox>

diff --git a/src/dialogs/flagedit.h b/src/dialogs/flagedit.h
index e61a18d..e501483 100644 (file)
--- a/src/dialogs/flagedit.h
+++ b/src/dialogs/flagedit.h
@@ -16,7 +16,7 @@
 #include <QDialog>
 #include <QStringList>
 
-#include "MOFlag.h"
+#include "MOFlag"
 
 class QStandardItemModel;
 class QTableView;

diff --git a/src/dialogs/orderwin.cpp b/src/dialogs/orderwin.cpp
index 184848f..5997f57 100644 (file)
--- a/src/dialogs/orderwin.cpp
+++ b/src/dialogs/orderwin.cpp
@@ -19,7 +19,7 @@
 #include "msinterface.h"
 #include "templates.h"
 
-#include "MOEvent.h"
+#include "MOEvent"
 
 #include <QApplication>
 #include <QBoxLayout>

diff --git a/src/dialogs/orderwin.h b/src/dialogs/orderwin.h
index a846756..dd4881a 100644 (file)
--- a/src/dialogs/orderwin.h
+++ b/src/dialogs/orderwin.h
@@ -17,8 +17,8 @@
 #include <QMainWindow>
 #include "odtrender.h"
 
-#include "MOOrder.h"
-#include "MOShipping.h"
+#include "MOOrder"
+#include "MOShipping"
 
 class QAction;
 class QLabel;

diff --git a/src/dialogs/pricecatdlg.h b/src/dialogs/pricecatdlg.h
index 37e3a95..8012dbe 100644 (file)
--- a/src/dialogs/pricecatdlg.h
+++ b/src/dialogs/pricecatdlg.h
@@ -15,7 +15,7 @@
 
 #include <QDialog>
 
-#include "MOPriceCategory.h"
+#include "MOPriceCategory"
 
 class QListWidget;
 

diff --git a/src/dialogs/shipping.cpp b/src/dialogs/shipping.cpp
index 86e3767..60197f9 100644 (file)
--- a/src/dialogs/shipping.cpp
+++ b/src/dialogs/shipping.cpp
@@ -15,7 +15,7 @@
 #include "centbox.h"
 #include "flagedit.h"
 
-#include "MOShipping.h"
+#include "MOShipping"
 
 #include "msinterface.h"
 

diff --git a/src/dialogs/shipping.h b/src/dialogs/shipping.h
index 58815aa..e689a97 100644 (file)
--- a/src/dialogs/shipping.h
+++ b/src/dialogs/shipping.h
@@ -19,7 +19,7 @@
 class QStandardItemModel;
 class QTableView;
 
-#include "MOShipping.h"
+#include "MOShipping"
 
 class MShippingEditor:public QDialog
 {

diff --git a/src/iface/msinterface.h b/src/iface/msinterface.h
index dbe0b19..5fa9929 100644 (file)
--- a/src/iface/msinterface.h
+++ b/src/iface/msinterface.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MSINTERFACE_H
 #define MAGICSMOKE_MSINTERFACE_H
 
-#include "MInterface.h"
+#include "MInterface"
 
 #define req (MSInterface::instance())
 

diff --git a/src/libs.pri b/src/libs.pri
index 56c723c..cba5f01 100644 (file)
--- a/src/libs.pri
+++ b/src/libs.pri
@@ -1,4 +1,13 @@
 # Libraries for Magic Smoke by (c) Konrad Rosenbaum, 2007-2010
 
-LIBS += -L../zip -lzip -L../pack/qtbase -lqwbase -L../tzone -ltzdata
-INCLUDEPATH += ../zip ../pack/qtbase ../tzone
+# ZIP library
+LIBS += -L../zip -lQZip
+INCLUDEPATH += ../zip/include
+
+# PACK library
+LIBS += -L../pack/qtbase -lqwbase
+INCLUDEPATH += ../pack/qtbase/include
+
+# Time Zone DB library
+LIBS += -L../tzone -ltzdata
+INCLUDEPATH += ../tzone/include

diff --git a/src/misc/misc.cpp b/src/misc/misc.cpp
index a2829f8..71b1798 100644 (file)
--- a/src/misc/misc.cpp
+++ b/src/misc/misc.cpp
@@ -12,11 +12,11 @@
 
 #include "misc.h"
 
-#include <tzdata.h>
+#include <TimeStamp>
 
 #include <math.h>
 
-#include "MOServerFormat.h"
+#include "MOServerFormat"
 
 #include <QCoreApplication>
 #include <QDateTime>

diff --git a/src/misc/sclock.cpp b/src/misc/sclock.cpp
index 611d390..c383afb 100644 (file)
--- a/src/misc/sclock.cpp
+++ b/src/misc/sclock.cpp
@@ -23,7 +23,7 @@
 #include <QTimer>
 #include <QBoxLayout>
 
-#include "tzdata.h"
+#include <TimeStamp>
 #include "misc.h"
 
 MServerClock::MServerClock()

diff --git a/src/mwin/carttab.h b/src/mwin/carttab.h
index 384114a..8006db3 100644 (file)
--- a/src/mwin/carttab.h
+++ b/src/mwin/carttab.h
@@ -19,7 +19,7 @@
 #include <QMainWindow>
 #include <QTimer>
 
-#include "MOCustomer.h"
+#include "MOCustomer"
 
 class QAction;
 class QCheckBox;

diff --git a/src/mwin/eventstab.cpp b/src/mwin/eventstab.cpp
index 51f9ceb..a21ce9e 100644 (file)
--- a/src/mwin/eventstab.cpp
+++ b/src/mwin/eventstab.cpp
@@ -20,7 +20,7 @@
 
 #include "eventstab.h"
 
-#include "tzdata.h"
+#include <TimeStamp>
 
 #include <QApplication>
 #include <QBoxLayout>

diff --git a/src/mwin/orderstab.cpp b/src/mwin/orderstab.cpp
index 4379753..9f1ce17 100644 (file)
--- a/src/mwin/orderstab.cpp
+++ b/src/mwin/orderstab.cpp
@@ -20,7 +20,7 @@
 
 #include "orderstab.h"
 
-#include "tzdata.h"
+#include <TimeStamp>
 
 #include <QBoxLayout>
 #include <QComboBox>

diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp
index dc044c4..365f2e9 100644 (file)
--- a/src/mwin/overview.cpp
+++ b/src/mwin/overview.cpp
@@ -26,7 +26,8 @@
 
 #include "centbox.h"
 #include "sclock.h"
-#include "tzdata.h"
+
+#include <TimeStamp>
 
 #include <QBoxLayout>
 #include <QCheckBox>

diff --git a/src/templates/odtrender.cpp b/src/templates/odtrender.cpp
index b5934a6..3d6d734 100644 (file)
--- a/src/templates/odtrender.cpp
+++ b/src/templates/odtrender.cpp
@@ -20,8 +20,8 @@
 #include <QSettings>
 #include <QTemporaryFile>
 
-#include "qunzip.h"
-#include "qzip.h"
+#include "QUnZip"
+#include "QZip"
 
 
 class MOdtRendererPrivate

diff --git a/src/templates/ticketrender.cpp b/src/templates/ticketrender.cpp
index d637661..f0ed150 100644 (file)
--- a/src/templates/ticketrender.cpp
+++ b/src/templates/ticketrender.cpp
@@ -30,8 +30,8 @@
 #include "qzip.h"
 #include "code39.h"
 
-#include "MOTicket.h"
-#include "MOVoucher.h"
+#include "MOTicket"
+#include "MOVoucher"
 
 
 class MLabelRendererPrivate

diff --git a/src/wext/MOAddress b/src/wext/MOAddress
new file mode 100644 (file)
index 0000000..d85f82c
--- /dev/null
+++ b/src/wext/MOAddress
@@ -0,0 +1 @@
+#include"address.h"

diff --git a/src/wext/MOCustomer b/src/wext/MOCustomer
new file mode 100644 (file)
index 0000000..396763a
--- /dev/null
+++ b/src/wext/MOCustomer
@@ -0,0 +1 @@
+#include"customer.h"

diff --git a/src/wext/MOCustomerInfo b/src/wext/MOCustomerInfo
new file mode 100644 (file)
index 0000000..468bee4
--- /dev/null
+++ b/src/wext/MOCustomerInfo
@@ -0,0 +1 @@
+#include"customerinfo.h"

diff --git a/src/wext/MOEvent b/src/wext/MOEvent
new file mode 100644 (file)
index 0000000..0da8fbb
--- /dev/null
+++ b/src/wext/MOEvent
@@ -0,0 +1 @@
+#include"event.h"

diff --git a/src/wext/MOOrder b/src/wext/MOOrder
new file mode 100644 (file)
index 0000000..4222ffc
--- /dev/null
+++ b/src/wext/MOOrder
@@ -0,0 +1 @@
+#include"order.h"

diff --git a/src/wext/MOOrderInfo b/src/wext/MOOrderInfo
new file mode 100644 (file)
index 0000000..61ee41e
--- /dev/null
+++ b/src/wext/MOOrderInfo
@@ -0,0 +1 @@
+#include"orderinfo.h"

diff --git a/src/wext/MORole b/src/wext/MORole
new file mode 100644 (file)
index 0000000..9a0512e
--- /dev/null
+++ b/src/wext/MORole
@@ -0,0 +1 @@
+#include"role.h"

diff --git a/src/wext/MOTicket b/src/wext/MOTicket
new file mode 100644 (file)
index 0000000..056e50f
--- /dev/null
+++ b/src/wext/MOTicket
@@ -0,0 +1 @@
+#include"ticket.h"

diff --git a/src/wext/MOVoucher b/src/wext/MOVoucher
new file mode 100644 (file)
index 0000000..81cd139
--- /dev/null
+++ b/src/wext/MOVoucher
@@ -0,0 +1 @@
+#include"voucher.h"

diff --git a/src/wext/MTransaction b/src/wext/MTransaction
new file mode 100644 (file)
index 0000000..1fadece
--- /dev/null
+++ b/src/wext/MTransaction
@@ -0,0 +1 @@
+#include "transaction.h"

diff --git a/src/wext/MOAddress.cpp b/src/wext/address.cpp
similarity index 97%
rename from src/wext/MOAddress.cpp
rename to src/wext/address.cpp
index 9a7d8cf..e136c13 100644 (file)
--- a/src/wext/MOAddress.cpp
+++ b/src/wext/address.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MOAddress.h"
+#include "MOAddress"
 
 #include <QStringList>
 

diff --git a/src/wext/MOAddress.h b/src/wext/address.h
similarity index 95%
rename from src/wext/MOAddress.h
rename to src/wext/address.h
index 8c21328..2555ac9 100644 (file)
--- a/src/wext/MOAddress.h
+++ b/src/wext/address.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MADDRESS_H
 #define MAGICSMOKE_MADDRESS_H
 
-#include "MOAddressAbstract.h"
+#include "MOAddressAbstract"
 
 #include <QMetaType>
 

diff --git a/src/wext/MOCustomer.cpp b/src/wext/customer.cpp
similarity index 94%
rename from src/wext/MOCustomer.cpp
rename to src/wext/customer.cpp
index 6d487de..ea62427 100644 (file)
--- a/src/wext/MOCustomer.cpp
+++ b/src/wext/customer.cpp
@@ -10,8 +10,8 @@
 //
 //
 
-#include "MOCustomer.h"
-#include "MOCustomerInfo.h"
+#include "MOCustomer"
+#include "MOCustomerInfo"
 #include "msinterface.h"
 
 MOCustomer::MOCustomer(qint64 i)

diff --git a/src/wext/MOCustomer.h b/src/wext/customer.h
similarity index 96%
rename from src/wext/MOCustomer.h
rename to src/wext/customer.h
index bde3b20..c671e90 100644 (file)
--- a/src/wext/MOCustomer.h
+++ b/src/wext/customer.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MOCUSTOMER_H
 #define MAGICSMOKE_MOCUSTOMER_H
 
-#include "MOCustomerAbstract.h"
+#include "MOCustomerAbstract"
 
 class MOCustomerInfo;
 

diff --git a/src/wext/MOCustomerInfo.cpp b/src/wext/customerinfo.cpp
similarity index 94%
rename from src/wext/MOCustomerInfo.cpp
rename to src/wext/customerinfo.cpp
index 336d1a2..1640591 100644 (file)
--- a/src/wext/MOCustomerInfo.cpp
+++ b/src/wext/customerinfo.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MOCustomerInfo.h"
+#include "MOCustomerInfo"
 
 QString MOCustomerInfo::fullName()const
 {

diff --git a/src/wext/MOCustomerInfo.h b/src/wext/customerinfo.h
similarity index 94%
rename from src/wext/MOCustomerInfo.h
rename to src/wext/customerinfo.h
index 76b8900..9f2199d 100644 (file)
--- a/src/wext/MOCustomerInfo.h
+++ b/src/wext/customerinfo.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MOCUSTOMERI_H
 #define MAGICSMOKE_MOCUSTOMERI_H
 
-#include "MOCustomerInfoAbstract.h"
+#include "MOCustomerInfoAbstract"
 class MOCustomerInfo:public MOCustomerInfoAbstract
 {
        WOBJECT(MOCustomerInfo);

diff --git a/src/wext/MOEvent.cpp b/src/wext/event.cpp
similarity index 97%
rename from src/wext/MOEvent.cpp
rename to src/wext/event.cpp
index 1e858b6..f24f234 100644 (file)
--- a/src/wext/MOEvent.cpp
+++ b/src/wext/event.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MOEvent.h"
+#include "MOEvent"
 
 #include <QCoreApplication>
 #include <QRegExp>

diff --git a/src/wext/MOEvent.h b/src/wext/event.h
similarity index 97%
rename from src/wext/MOEvent.h
rename to src/wext/event.h
index 3abc028..8b00584 100644 (file)
--- a/src/wext/MOEvent.h
+++ b/src/wext/event.h
@@ -14,7 +14,7 @@
 #define EVENT_H
 
 #include <QString>
-#include <MOEventAbstract.h>
+#include <MOEventAbstract>
 
 /**encapsulation of an event, this class wraps the auto-generated event class to provide some convenience methods*/
 class MOEvent:public MOEventAbstract

diff --git a/src/wext/MOOrder.cpp b/src/wext/order.cpp
similarity index 99%
rename from src/wext/MOOrder.cpp
rename to src/wext/order.cpp
index 75d010c..7a3c32e 100644 (file)
--- a/src/wext/MOOrder.cpp
+++ b/src/wext/order.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MOOrder.h"
+#include "MOOrder"
 
 #include "msinterface.h"
 

diff --git a/src/wext/MOOrder.h b/src/wext/order.h
similarity index 98%
rename from src/wext/MOOrder.h
rename to src/wext/order.h
index 2f6f467..af0b3b9 100644 (file)
--- a/src/wext/MOOrder.h
+++ b/src/wext/order.h
@@ -13,10 +13,10 @@
 #ifndef MAGICSMOKE_MOORDER_H
 #define MAGICSMOKE_MOORDER_H
 
-#include "MOOrderAbstract.h"
+#include "MOOrderAbstract"
 #include "misc.h"
 
-#include "tzdata.h"
+#include <TimeStamp>
 
 /**this class represents a complete order*/
 class MOOrder:public MOOrderAbstract

diff --git a/src/wext/MOOrderInfo.h b/src/wext/orderinfo.h
similarity index 96%
rename from src/wext/MOOrderInfo.h
rename to src/wext/orderinfo.h
index a033669..6b658d5 100644 (file)
--- a/src/wext/MOOrderInfo.h
+++ b/src/wext/orderinfo.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MOORDERI_H
 #define MAGICSMOKE_MOORDERI_H
 
-#include "MOOrderInfoAbstract.h"
+#include "MOOrderInfoAbstract"
 #include "misc.h"
 
 class MOOrderInfo:public MOOrderInfoAbstract

diff --git a/src/wext/MORole.h b/src/wext/role.h
similarity index 91%
rename from src/wext/MORole.h
rename to src/wext/role.h
index ac961a5..6c5e012 100644 (file)
--- a/src/wext/MORole.h
+++ b/src/wext/role.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MOROLE_H
 #define MAGICSMOKE_MOROLE_H
 
-#include "MORoleAbstract.h"
+#include "MORoleAbstract"
 typedef MORoleAbstract MORole;
 
 #endif
\ No newline at end of file

diff --git a/src/wext/MOTicket.cpp b/src/wext/ticket.cpp
similarity index 97%
rename from src/wext/MOTicket.cpp
rename to src/wext/ticket.cpp
index c3e4bf1..1bf75e3 100644 (file)
--- a/src/wext/MOTicket.cpp
+++ b/src/wext/ticket.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MOTicket.h"
+#include "MOTicket"
 #include "msinterface.h"
 
 MOEvent MOTicket::event()const

diff --git a/src/wext/MOTicket.h b/src/wext/ticket.h
similarity index 95%
rename from src/wext/MOTicket.h
rename to src/wext/ticket.h
index 2136d76..34ab3bd 100644 (file)
--- a/src/wext/MOTicket.h
+++ b/src/wext/ticket.h
@@ -13,9 +13,9 @@
 #ifndef MAGICSMOKE_MOTICKET_H
 #define MAGICSMOKE_MOTICKET_H
 
-#include "MOTicketAbstract.h"
+#include "MOTicketAbstract"
 #include "misc.h"
-#include "MOEvent.h"
+#include "MOEvent"
 
 class MOTicket:public MOTicketAbstract
 {

diff --git a/src/wext/MTransaction.cpp b/src/wext/transaction.cpp
similarity index 95%
rename from src/wext/MTransaction.cpp
rename to src/wext/transaction.cpp
index 482abd2..80da582 100644 (file)
--- a/src/wext/MTransaction.cpp
+++ b/src/wext/transaction.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include "MTransaction.h"
+#include "MTransaction"
 #include "waitcursor.h"
 
 QByteArray MTransaction::executeQuery(QString hreq,QByteArray data)

diff --git a/src/wext/MTransaction.h b/src/wext/transaction.h
similarity index 96%
rename from src/wext/MTransaction.h
rename to src/wext/transaction.h
index c90705c..fd244c9 100644 (file)
--- a/src/wext/MTransaction.h
+++ b/src/wext/transaction.h
@@ -13,7 +13,7 @@
 #ifndef MSMOKE_MTRANSACTION_H
 #define MSMOKE_MTRANSACTION_H
 
-#include "WTransaction.h"
+#include <WTransaction>
 
 class MTransaction:public WTransaction{
        protected:

diff --git a/src/wext/MOVoucher.h b/src/wext/voucher.h
similarity index 96%
rename from src/wext/MOVoucher.h
rename to src/wext/voucher.h
index 4971f1f..620684d 100644 (file)
--- a/src/wext/MOVoucher.h
+++ b/src/wext/voucher.h
@@ -13,7 +13,7 @@
 #ifndef MAGICSMOKE_MOVOUCHER_H
 #define MAGICSMOKE_MOVOUCHER_H
 
-#include "MOVoucherAbstract.h"
+#include "MOVoucherAbstract"
 #include "misc.h"
 
 class MOVoucher:public MOVoucherAbstract

diff --git a/src/wext/wext.pri b/src/wext/wext.pri
index 910210d..2e5b9a3 100644 (file)
--- a/src/wext/wext.pri
+++ b/src/wext/wext.pri
@@ -1,21 +1,21 @@
 INCLUDEPATH += ./wext
 
 HEADERS += \
-       wext/MOCustomerInfo.h \
-       wext/MOOrder.h \
-       wext/MOOrderInfo.h \
-       wext/MORole.h \
-       wext/MOTicket.h \
-       wext/MOAddress.h \
-       wext/MOEvent.h \
-       wext/MOCustomer.h \
-       wext/MTransaction.h
+       wext/customerinfo.h \
+       wext/order.h \
+       wext/orderinfo.h \
+       wext/role.h \
+       wext/ticket.h \
+       wext/address.h \
+       wext/event.h \
+       wext/customer.h \
+       wext/transaction.h
 
 SOURCES += \
-       wext/MOCustomerInfo.cpp \
-       wext/MOOrder.cpp \
-       wext/MOTicket.cpp \
-       wext/MOAddress.cpp \
-       wext/MOEvent.cpp \
-       wext/MOCustomer.cpp \
-       wext/MTransaction.cpp
+       wext/customerinfo.cpp \
+       wext/order.cpp \
+       wext/ticket.cpp \
+       wext/address.cpp \
+       wext/event.cpp \
+       wext/customer.cpp \
+       wext/transaction.cpp