-rw-r--r-- | noncore/settings/tabmanager/main.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmainwindow.h | 4 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tabmanager.pro | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/noncore/settings/tabmanager/main.cpp b/noncore/settings/tabmanager/main.cpp index f737de5..cf6f835 100644 --- a/noncore/settings/tabmanager/main.cpp +++ b/noncore/settings/tabmanager/main.cpp | |||
@@ -1,12 +1,5 @@ | |||
1 | #include "tabmainwindow.h" | 1 | #include "tabmainwindow.h" |
2 | #include <qpe/qpeapplication.h> | 2 | #include <opie2/oapplicationfactory.h> |
3 | 3 | ||
4 | int main( int argc, char **argv ){ | 4 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<TabMainWindow> ) |
5 | QPEApplication application( argc, argv ); | ||
6 | TabMainWindow mainWindow; | ||
7 | application.showMainWidget(&mainWindow); | ||
8 | return application.exec(); | ||
9 | } | ||
10 | |||
11 | //main.cpp | ||
12 | 5 | ||
diff --git a/noncore/settings/tabmanager/tabmainwindow.h b/noncore/settings/tabmanager/tabmainwindow.h index 69fb15d..d154f1e 100644 --- a/noncore/settings/tabmanager/tabmainwindow.h +++ b/noncore/settings/tabmanager/tabmainwindow.h | |||
@@ -5,17 +5,19 @@ | |||
5 | #include <qmainwindow.h> | 5 | #include <qmainwindow.h> |
6 | #include <qtoolbar.h> | 6 | #include <qtoolbar.h> |
7 | #include <qtoolbutton.h> | 7 | #include <qtoolbutton.h> |
8 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | 9 | ||
10 | class TabMainWindow : public QMainWindow { | 10 | class TabMainWindow : public QMainWindow { |
11 | 11 | ||
12 | public: | 12 | public: |
13 | TabMainWindow( QWidget* parent = 0, const char* name = 0) : QMainWindow(parent, name){ | 13 | static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); } |
14 | |||
15 | TabMainWindow( QWidget* parent = 0, const char* name = 0, WFlags fl = 0) : QMainWindow(parent, name, fl){ | ||
14 | tabManager = new TabManager(this, "TabManger"); | 16 | tabManager = new TabManager(this, "TabManger"); |
15 | setCaption("Tab Manager"); | 17 | setCaption("Tab Manager"); |
16 | setToolBarsMovable(false); | 18 | setToolBarsMovable(false); |
17 | this->setCentralWidget(tabManager); | 19 | this->setCentralWidget(tabManager); |
18 | QToolBar *newToolBar = new QToolBar("toolbar", this); | 20 | QToolBar *newToolBar = new QToolBar("toolbar", this); |
19 | QToolBar *emptyToolBar = new QToolBar("empty", this); | 21 | QToolBar *emptyToolBar = new QToolBar("empty", this); |
20 | emptyToolBar->setHorizontalStretchable(true); | 22 | emptyToolBar->setHorizontalStretchable(true); |
21 | 23 | ||
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro index d4aac43..f65a1d7 100644 --- a/noncore/settings/tabmanager/tabmanager.pro +++ b/noncore/settings/tabmanager/tabmanager.pro | |||
@@ -1,12 +1,10 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt quick-app |
2 | CONFIG = qt warn_on | ||
3 | HEADERS = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h | 2 | HEADERS = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h |
4 | SOURCES = main.cpp tabmanager.cpp tabmanagerbase.cpp | 3 | SOURCES = main.cpp tabmanager.cpp tabmanagerbase.cpp |
5 | INCLUDEPATH+= $(OPIEDIR)/include | 4 | INCLUDEPATH+= $(OPIEDIR)/include |
6 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 6 | LIBS += -lqpe -lopiecore2 |
8 | INTERFACES= app.ui wait.ui | 7 | INTERFACES= app.ui wait.ui |
9 | TARGET = tabmanager | 8 | TARGET = tabmanager |
10 | DESTDIR = $(OPIEDIR)/bin | ||
11 | 9 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |