summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 23:12:27 (UTC)
committer drw <drw>2004-02-23 23:12:27 (UTC)
commitbff739b1760881bb326ec38ebe62a52195b8c032 (patch) (side-by-side diff)
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 @@
config TABOAPP
boolean "taboapp"
default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OAPP && EXPERIMENTAL
+ 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 @@
#include <qdir.h>
#include <qpe/global.h>
#include <qpe/qpeapplication.h>
#include <qpe/qlibrary.h>
#include <oappinterface.h>
#include <oappplugin.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
int main( int argc, char **argv )
{
QPEApplication a( argc, argv );
OTabWidget *tabwidget = new OTabWidget(0, "tab widget");
QString path = QPEApplication::qpeDir() + "/plugins/app";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
QStringList::Iterator it;
@@ -41,14 +41,14 @@ int main( int argc, char **argv )
if (type.left(3) == "lib")
type = type.mid(3);
type = type.right( type.find("lib") );
QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
if ( trans->load( tfn ))
qApp->installTranslator( trans );
else
delete trans;
}
}
a.showMainDocumentWidget(tabwidget);
- return a.exec();
+ return a.exec();
}
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 @@
TEMPLATE = app
CONFIG = qt warn_on release
DESTDIR = $(OPIEDIR)/bin
SOURCES = main.cpp
-INCLUDEPATH += $(OPIEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include .
TARGET = taboapp
-LIBS += -lqpe -lopie -loapp
+LIBS += -lqpe -lopieui2 -loapp
INCLUDEPATH += $(OPIEDIR)/core/apps/oapp
DEPENDPATH += $(OPIEDIR)/core/apps/oapp
MOC_DIR = .build
OBJECTS_DIR = .build
UI_DIR = .build
include ( $(OPIEDIR)/include.pro )