| -rw-r--r-- | core/apps/taboapp/config.in | 2 | ||||
| -rw-r--r-- | core/apps/taboapp/main.cpp | 4 | ||||
| -rw-r--r-- | core/apps/taboapp/taboapp.pro | 4 |
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,54 +1,54 @@ #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; QInterfacePtr<OAppInterface> iface; for ( it = list.begin(); it != list.end(); ++it ) { QLibrary *lib = new QLibrary( path + "/" + *it ); qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); if ( lib->queryInterface( IID_OAppInterface, (QUnknownInterface**)&iface ) == QS_OK ) { qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); QList<QWidget> list = iface->widgets(); QWidget *widget; for ( widget = list.first(); widget != 0; widget = list.next() ) tabwidget->addTab(widget, QString(*it), QString(*it)); QString lang = getenv( "LANG" ); if (lang.isNull()) lang = "en"; QTranslator *trans = new QTranslator(qApp); QString type = (*it).left( (*it).find(".") ); 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 ) |