author | mickeyl <mickeyl> | 2004-04-09 14:06:05 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-09 14:06:05 (UTC) |
commit | 5f294a018a0f44a6547485bc73a095cd0c153903 (patch) (side-by-side diff) | |
tree | ea19ba0afea3e8d4a226719a3590cf11e5fc5178 /noncore | |
parent | 208a155ee480e5c1ae0fd6e8876a6ffea7f1c4a5 (diff) | |
download | opie-5f294a018a0f44a6547485bc73a095cd0c153903.zip opie-5f294a018a0f44a6547485bc73a095cd0c153903.tar.gz opie-5f294a018a0f44a6547485bc73a095cd0c153903.tar.bz2 |
libopie1 --> libopie2
-rw-r--r-- | noncore/apps/opie-gutenbrowser/browserDialog.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/config.in | 6 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/openetext.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/opie-gutenbrowser.pro | 5 |
4 files changed, 16 insertions, 11 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 @@ -5,19 +5,22 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com ****************************************************************************/ #include "optionsDialog.h" //#include "fileBrowser.h" +/* OPIE */ +#include <opie2/ofiledialog.h> +using namespace Opie::Ui; + +/* QT */ #include <qlabel.h> #include <qlistbox.h> #include <qpushbutton.h> #include <qlayout.h> -#include <opie/ofiledialog.h> - void optionsDialog::BrowserDlg( ) { // setCaption( tr( "Choose Browser" ) ); http_ListBox1->insertItem( tr( "Opera")); http_ListBox1->insertItem( tr( "Konqueror")); http_ListBox1->insertItem( tr( "wget")); 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 @@ -13,21 +13,22 @@ ***************************************************************************/ #include "gutenbrowser.h" #include "openetext.h" #include "editTitle.h" -#include <qfileinfo.h> +/* OPIE */ +#include <opie2/ofiledialog.h> #include <qpe/applnk.h> +#include <qpe/config.h> #include <qpe/qpeapplication.h> +using namespace Opie::Ui; #include <stdlib.h> #include <qtextstream.h> -#include <qpe/config.h> - -#include <opie/ofiledialog.h> +#include <qfileinfo.h> #if defined(_WS_WIN_) #include <windows.h> #else #include <unistd.h> #include "sys/stat.h" 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,9 +1,8 @@ TEMPLATE = app -CONFIG += qt warn_on release quick-app -#CONFIG += qt warn_on release qpp +CONFIG += qt warn_on quick-app HEADERS = LibraryDialog.h \ SearchDialog.h \ SearchResults.h \ helpme.h \ multiline_ex.h \ openetext.h \ @@ -37,9 +36,9 @@ SOURCES = LibraryDialog.cpp \ main.cpp TARGET = gutenbrowser INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/bin -LIBS += -lqpe -lpthread -lftplib -lopie +LIBS += -lqpe -lpthread -lftplib -lopiecore2 -lopieui2 include ( $(OPIEDIR)/include.pro ) |