From 577cdc4f2ce81eaceb132af08d8ab6fe12b4eadc Mon Sep 17 00:00:00 2001 From: tille Date: Wed, 03 Sep 2003 15:49:42 +0000 Subject: libopie2fied it was always a test app ;) --- diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro index f6227f7..d2629de 100644 --- a/noncore/apps/confedit/confedit.pro +++ b/noncore/apps/confedit/confedit.pro @@ -6,8 +6,8 @@ HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemcon SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/ioclude -LIBS += -lqpe INTERFACES = +LIBS += -lopiecore2 -lopieui2 TARGET = confedit TRANSLATIONS = ../../../i18n/de/confedit.ts \ @@ -29,5 +29,15 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \ ../../../i18n/zh_TW/confedit.ts +!contains( platform, x11 ) { + + include ( $(OPIEDIR)/include.pro ) + LIBS += -lqpe +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} + + -include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/apps/confedit/listviewitemconf.cpp b/noncore/apps/confedit/listviewitemconf.cpp index 91edca2..61bd7ea 100644 --- a/noncore/apps/confedit/listviewitemconf.cpp +++ b/noncore/apps/confedit/listviewitemconf.cpp @@ -13,13 +13,13 @@ ListViewItemConf::ListViewItemConf(ListViewItemConf *parent) : QListViewItem(parent), _changed(false) { } - + ListViewItemConf::ListViewItemConf(QListView *parent) : QListViewItem(parent), _changed(false) { _type = File; } - + ListViewItemConf::~ListViewItemConf() { } @@ -48,4 +48,7 @@ void ListViewItemConf::unchanged() bool ListViewItemConf::revertable() { return _changed; -} \ No newline at end of file +} + + + diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp index 6c18adb..7e7f064 100644 --- a/noncore/apps/confedit/main.cpp +++ b/noncore/apps/confedit/main.cpp @@ -1,12 +1,11 @@ #include "mainwindow.h" -#include +#include int main( int argc, char ** argv ) { - - QPEApplication a( argc, argv ); + OApplication a( argc, argv, "confedit" ); MainWindow mw; mw.showMaximized(); a.showMainDocumentWidget( &mw ); diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 8e36980..58538af 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp @@ -12,12 +12,12 @@ #include "mainwindow.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -28,6 +28,7 @@ #include #include #include +#include #include "listviewconfdir.h" #include "listviewitemconf.h" -- cgit v0.9.0.2