ODP and only ODP

7 files changed, 8 insertions, 6 deletions

diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 281835e..c5df47f 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -48,8 +48,9 @@
 
 #include "konsole.h"
 #include "commandeditdialog.h"
 
+using namespace Opie;
 class EKNumTabBar : public QTabBar
 {
 public:
     EKNumTabBar(QWidget *parent = 0, const char *name = 0) :
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index fe30b7e..b456ce2 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -24,6 +24,7 @@
 #include <opie2/oapplicationfactory.h>
 
 
 /* --| main |------------------------------------------------------ */
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
 
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp
index c726cd3..66241ae 100644
--- a/core/apps/helpbrowser/main.cpp
+++ b/core/apps/helpbrowser/main.cpp
@@ -21,5 +21,6 @@
 #include "helpbrowser.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> )
diff --git a/core/apps/qcop/config.in b/core/apps/qcop/config.in
index 2bd1a73..f99ff03 100644
--- a/core/apps/qcop/config.in
+++ b/core/apps/qcop/config.in
@@ -1,4 +1,4 @@
   config QCOP
-    boolean "opie-qcop (inter-application communication daemon)"
+    boolean "opie-qcop (inter-application communication client)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp
index 9aee47b..d05d6d6 100644
--- a/core/apps/textedit/main.cpp
+++ b/core/apps/textedit/main.cpp
@@ -21,5 +21,6 @@
 #include "textedit.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<TextEdit> )
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index b54da34..5bb65a9 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -36,11 +36,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h> //getenv
 
-using Opie::OFileDialog;
-using Opie::OFileSelector;
-using Opie::OFontSelector;
+using namespace Opie::Ui;
 
 #if QT_VERSION < 300
 
 class QpeEditor : public QMultiLineEdit
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 34f3617..6cc693f 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -29,9 +29,9 @@
 
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 
-//#include <opie/ofileselector.h>
+//#include <opie2/ofileselector.h>
 
 #include <qmainwindow.h>
 #include <qmultilineedit.h>
 #include <qlist.h>