summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 23:12:27 (UTC)
committer drw <drw>2004-02-23 23:12:27 (UTC)
commitbff739b1760881bb326ec38ebe62a52195b8c032 (patch) (unidiff)
treeaf346d65cb9ce04c9264b518938d2b8a384e0c27
parent728207110007fd6ab6ca945905e7236326a797d7 (diff)
downloadopie-bff739b1760881bb326ec38ebe62a52195b8c032.zip
opie-bff739b1760881bb326ec38ebe62a52195b8c032.tar.gz
opie-bff739b1760881bb326ec38ebe62a52195b8c032.tar.bz2
Tab OApp: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/taboapp/config.in2
-rw-r--r--core/apps/taboapp/main.cpp4
-rw-r--r--core/apps/taboapp/taboapp.pro4
3 files changed, 5 insertions, 5 deletions
diff --git a/core/apps/taboapp/config.in b/core/apps/taboapp/config.in
index 1b9cdd5..8f5136b 100644
--- a/core/apps/taboapp/config.in
+++ b/core/apps/taboapp/config.in
@@ -1,4 +1,4 @@
1 config TABOAPP 1 config TABOAPP
2 boolean "taboapp" 2 boolean "taboapp"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OAPP && EXPERIMENTAL 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && OAPP && EXPERIMENTAL
diff --git a/core/apps/taboapp/main.cpp b/core/apps/taboapp/main.cpp
index 5f7f86c..4b9451e 100644
--- a/core/apps/taboapp/main.cpp
+++ b/core/apps/taboapp/main.cpp
@@ -1,21 +1,21 @@
1#include <qdir.h> 1#include <qdir.h>
2 2
3#include <qpe/global.h> 3#include <qpe/global.h>
4#include <qpe/qpeapplication.h> 4#include <qpe/qpeapplication.h>
5#include <qpe/qlibrary.h> 5#include <qpe/qlibrary.h>
6#include <oappinterface.h> 6#include <oappinterface.h>
7#include <oappplugin.h> 7#include <oappplugin.h>
8 8
9#include <opie/otabwidget.h> 9#include <opie2/otabwidget.h>
10 10
11int main( int argc, char **argv ) 11int main( int argc, char **argv )
12{ 12{
13 QPEApplication a( argc, argv ); 13 QPEApplication a( argc, argv );
14 14
15 OTabWidget *tabwidget = new OTabWidget(0, "tab widget"); 15 OTabWidget *tabwidget = new OTabWidget(0, "tab widget");
16 16
17 QString path = QPEApplication::qpeDir() + "/plugins/app"; 17 QString path = QPEApplication::qpeDir() + "/plugins/app";
18 QDir dir( path, "lib*.so" ); 18 QDir dir( path, "lib*.so" );
19 19
20 QStringList list = dir.entryList(); 20 QStringList list = dir.entryList();
21 QStringList::Iterator it; 21 QStringList::Iterator it;
@@ -41,14 +41,14 @@ int main( int argc, char **argv )
41 if (type.left(3) == "lib") 41 if (type.left(3) == "lib")
42 type = type.mid(3); 42 type = type.mid(3);
43 type = type.right( type.find("lib") ); 43 type = type.right( type.find("lib") );
44 QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; 44 QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
45 if ( trans->load( tfn )) 45 if ( trans->load( tfn ))
46 qApp->installTranslator( trans ); 46 qApp->installTranslator( trans );
47 else 47 else
48 delete trans; 48 delete trans;
49 } 49 }
50 } 50 }
51 51
52 a.showMainDocumentWidget(tabwidget); 52 a.showMainDocumentWidget(tabwidget);
53 return a.exec(); 53 return a.exec();
54} 54}
diff --git a/core/apps/taboapp/taboapp.pro b/core/apps/taboapp/taboapp.pro
index d915921..0e8b66d 100644
--- a/core/apps/taboapp/taboapp.pro
+++ b/core/apps/taboapp/taboapp.pro
@@ -1,17 +1,17 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 SOURCES = main.cpp 5 SOURCES = main.cpp
6 6
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include . 8 DEPENDPATH+= $(OPIEDIR)/include .
9 TARGET = taboapp 9 TARGET = taboapp
10 LIBS += -lqpe -lopie -loapp 10 LIBS += -lqpe -lopieui2 -loapp
11 INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp 11 INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp
12 DEPENDPATH+= $(OPIEDIR)/core/apps/oapp 12 DEPENDPATH+= $(OPIEDIR)/core/apps/oapp
13 MOC_DIR = .build 13 MOC_DIR = .build
14 OBJECTS_DIR= .build 14 OBJECTS_DIR= .build
15 UI_DIR = .build 15 UI_DIR = .build
16 16
17include ( $(OPIEDIR)/include.pro ) 17include ( $(OPIEDIR)/include.pro )