summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp1
-rw-r--r--core/apps/embeddedkonsole/main.cpp1
-rw-r--r--core/apps/helpbrowser/main.cpp1
-rw-r--r--core/apps/qcop/config.in4
-rw-r--r--core/apps/textedit/main.cpp1
-rw-r--r--core/apps/textedit/textedit.cpp4
-rw-r--r--core/apps/textedit/textedit.h2
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
@@ -40,24 +40,25 @@
#include <qfile.h>
#include <qspinbox.h>
#include <qlayout.h>
#include <sys/wait.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include "konsole.h"
#include "commandeditdialog.h"
+using namespace Opie;
class EKNumTabBar : public QTabBar
{
public:
EKNumTabBar(QWidget *parent = 0, const char *name = 0) :
QTabBar(parent, name)
{}
// QList<QTab> *getTabList() { return(tabList()); }
void numberTabs()
{
// Yes, it really is this messy. QTabWidget needs functions
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
@@ -16,14 +16,15 @@
/* Ported Konsole to Qt/Embedded */
/* */
/* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */
/* */
/* -------------------------------------------------------------------------- */
#include "konsole.h"
#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
@@ -13,13 +13,14 @@
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#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
@@ -13,13 +13,14 @@
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#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
@@ -28,27 +28,25 @@
#include <qtextstream.h>
#include <qclipboard.h>
#include <qaction.h>
#include <qlineedit.h>
#include <qmessagebox.h>
#include <qlayout.h>
#include <qtimer.h>
#include <qdir.h>
#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
{
public:
QpeEditor( QWidget *parent, const char * name = 0 )
: QMultiLineEdit( parent, name ) {
clearTableFlags();
setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
}
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
@@ -21,25 +21,25 @@
#ifndef TEXTEDIT_H
#define TEXTEDIT_H
#define QTEXTEDIT_OPEN_API
//#include "fileBrowser.h"
//#include "fileSaver.h"
#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>
#include <qmap.h>
class QAction;
class QWidgetStack;
class QToolButton;
class QPopupMenu;
class QToolBar;
class QLineEdit;