libopie2fied

it was always a test app ;)

4 files changed, 27 insertions, 14 deletions

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
@@ -1,18 +1,18 @@
 DESTDIR		= $(OPIEDIR)/bin
 TEMPLATE	= app
 #CONFIG		= qt warn_on release
 CONFIG		= qt warn_on debug
 HEADERS		= mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
 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 \
 	 ../../../i18n/nl/confedit.ts \
 	 ../../../i18n/da/confedit.ts \
 	 ../../../i18n/xx/confedit.ts \
 	 ../../../i18n/en/confedit.ts \
 	 ../../../i18n/es/confedit.ts \
@@ -24,10 +24,20 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \
 	 ../../../i18n/pl/confedit.ts \
 	 ../../../i18n/pt/confedit.ts \
 	 ../../../i18n/pt_BR/confedit.ts \
 	 ../../../i18n/sl/confedit.ts \
 	 ../../../i18n/zh_CN/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
@@ -8,23 +8,23 @@
  ***************************************************************************/
 
 #include "listviewitemconf.h"
 
 ListViewItemConf::ListViewItemConf(ListViewItemConf *parent)
 	: QListViewItem(parent), _changed(false)
 {
 }
-	
+
 ListViewItemConf::ListViewItemConf(QListView *parent)
 	: QListViewItem(parent), _changed(false)
 {
 	_type = File;
 }
-	
+
 ListViewItemConf::~ListViewItemConf()
 {
 }
 
 int ListViewItemConf::getType()
 {
 	return _type;
 }
@@ -43,9 +43,12 @@ void ListViewItemConf::unchanged()
    	((ListViewItemConf*)it)->unchanged();
   }
  	displayText();
 }
 
 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,14 +1,13 @@
 
 #include "mainwindow.h"
 
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
 
 int main( int argc, char ** argv )
 {
-
-  QPEApplication a( argc, argv );
+  OApplication a( argc, argv, "confedit" );
   MainWindow mw;
   mw.showMaximized();
   a.showMainDocumentWidget( &mw );
   return a.exec();
 }
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
@@ -7,32 +7,33 @@
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 #include "mainwindow.h"
 
-#include <qpe/qpemenubar.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
+#include <opie2/omenubar.h>
+#include <opie2/omessagebox.h>
+#include <opie2/oresource.h>
+#include <opie2/oconfig.h>
+#include <opie2/otoolbar.h>
+#include <opie2/oapplication.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
+#include <qcursor.h>
 
 #include "listviewconfdir.h"
 #include "listviewitemconf.h"
 #include "listviewitemconfigentry.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)