libopie1 --> libopie2

4 files changed, 32 insertions, 27 deletions

diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 5c48da1..81dd516 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -10,2 +10,7 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 
+/* OPIE */
+#include <opie2/ofiledialog.h>
+using namespace Opie::Ui;
+
+/* QT */
 #include <qlabel.h>
@@ -15,4 +20,2 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 
-#include <opie/ofiledialog.h>
-
 void optionsDialog::BrowserDlg( )
@@ -73,3 +76,3 @@ void optionsDialog::BrowseSelected() {
 void optionsDialog::setHttp(int index) {
-    Config config("Gutenbrowser");    
+    Config config("Gutenbrowser");
     config.setGroup( "HttpServer" );
diff --git a/noncore/apps/opie-gutenbrowser/config.in b/noncore/apps/opie-gutenbrowser/config.in
index ec67d6e..d2a3033 100644
--- a/noncore/apps/opie-gutenbrowser/config.in
+++ b/noncore/apps/opie-gutenbrowser/config.in
@@ -1,4 +1,6 @@
-  config OPIE-GUTENBROWSER
+  config GUTENBROWSER
     boolean "gutenbrowser - Gutenberg Project etext reader and selector"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB
+    depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI
+    comment "gutenbrowser needs a libqpe, ftplib, libopie2core and libopie2ui"
+    depends !(( LIBQPE || LIBQPE-X11 ) && FTPLIB && LIBOPIE2CORE && LIBOPIE2UI)
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index 40f35d6..bd44ce6 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -18,5 +18,8 @@
 
-#include <qfileinfo.h>
+/* OPIE */
+#include <opie2/ofiledialog.h>
 #include <qpe/applnk.h>
+#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Ui;
 
@@ -24,5 +27,3 @@
 #include <qtextstream.h>
-#include <qpe/config.h>
-
-#include <opie/ofiledialog.h>
+#include <qfileinfo.h>
 
@@ -151,9 +152,9 @@ OpenFileButton->setDown(TRUE);
         if( filer.right(4) == ".txt"
-                                                || filer.right(4) == ".TXT"
-                                                || filer.right(4) == ".etx"
-                                                || filer.right(4) == ".ETX"
-                                                || filer.right(4) == ".etx"
-                                                || filer.right(4) == ".ETX"
-                                                || filer.right(4) == ".zip"
-                                                || filer.right(4) == ".ZIP" ) {
+                        || filer.right(4) == ".TXT"
+                        || filer.right(4) == ".etx"
+                        || filer.right(4) == ".ETX"
+                        || filer.right(4) == ".etx"
+                        || filer.right(4) == ".ETX"
+                        || filer.right(4) == ".zip"
+                        || filer.right(4) == ".ZIP" ) {
             QFileInfo zipFile( filer);
@@ -180,6 +181,6 @@ OpenFileButton->setDown(TRUE);
         } else
-                                                fileName = str;
-                                
+                        fileName = str;
+
         FindTitle(fileName);
-                                
+
         QFileInfo fi( fileName);
@@ -226,3 +227,3 @@ bool OpenEtext::FindTitle( QString filename)
     if ( indexLib.open( IO_ReadOnly) ) {
-                                qDebug("file opened successfully");
+                qDebug("file opened successfully");
         QTextStream indexStream( &indexLib );
@@ -266,4 +267,4 @@ bool OpenEtext::FindTitle( QString filename)
         } //endof file
-                                indexLib.close();
-                                
+                indexLib.close();
+
         if( !findCheck || title.length() < 2) {
diff --git a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
index e34e922..5c1d0c4 100644
--- a/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
+++ b/noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro
@@ -1,4 +1,3 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on release quick-app
-#CONFIG    += qt warn_on release qpp
+CONFIG    += qt warn_on quick-app
 HEADERS   = LibraryDialog.h \
@@ -13,3 +12,3 @@ HEADERS   = LibraryDialog.h \
           helpwindow.h \
-          output.h \    
+          output.h \
           NetworkDialog.h \
@@ -34,3 +33,3 @@ SOURCES   =  LibraryDialog.cpp \
           NetworkDialog.cpp \
-          gutenbrowserData.cpp \      
+          gutenbrowserData.cpp \
           gutenbrowser.cpp \
@@ -42,3 +41,3 @@ DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
-LIBS   += -lqpe -lpthread -lftplib -lopie
+LIBS   += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2