summaryrefslogtreecommitdiff
authordrw <drw>2004-02-24 00:01:04 (UTC)
committer drw <drw>2004-02-24 00:01:04 (UTC)
commit99bcf9b87929dfba62449f6e365eff561ed3fab9 (patch) (side-by-side diff)
tree26cda4ab533b907126a97056b5c96c3f9ab504df
parentda044756096aef5819add4c0faf5f305b155648f (diff)
downloadopie-99bcf9b87929dfba62449f6e365eff561ed3fab9.zip
opie-99bcf9b87929dfba62449f6e365eff561ed3fab9.tar.gz
opie-99bcf9b87929dfba62449f6e365eff561ed3fab9.tar.bz2
Embedded Konsole: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/config.in2
-rwxr-xr-xcore/apps/embeddedkonsole/embeddedkonsole.pro4
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp12
-rw-r--r--core/apps/embeddedkonsole/main.cpp12
-rw-r--r--core/apps/embeddedkonsole/opie-embeddedkonsole.control2
5 files changed, 11 insertions, 21 deletions
diff --git a/core/apps/embeddedkonsole/config.in b/core/apps/embeddedkonsole/config.in
index 3a421d6..a3a1844 100644
--- a/core/apps/embeddedkonsole/config.in
+++ b/core/apps/embeddedkonsole/config.in
@@ -1,4 +1,4 @@
config EMBEDDEDKONSOLE
boolean "opie-embeddedkonsole (konsole from KDE adapted for Qt/Embedded)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBQTAUX
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 427c013..2743488 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -27,12 +27,12 @@ SOURCES = TEScreen.cpp \
commandeditwidget.cpp \
playlistselection.cpp \
MyPty.cpp \
- main.cpp
+ main.cpp
INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui
TARGET = embeddedkonsole
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -lqtaux2
TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index d10b66d..46c0203 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -24,6 +24,10 @@
#include <stdlib.h>
+#ifdef QT_QWS_OPIE
+#include <opie2/ocolorpopupmenu.h>
+#endif
+
#include <qpe/resource.h>
#include <qdir.h>
@@ -63,10 +67,6 @@
#include "keytrans.h"
#include "commandeditdialog.h"
-#ifdef QT_QWS_OPIE
-#include <opie/colorpopupmenu.h>
-#endif
-
class EKNumTabBar : public QTabBar
{
public:
@@ -1527,7 +1527,7 @@ void Konsole::colorMenuSelected(int iD)
qDebug("do custom");
if(fromMenu)
{
- OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color");
+ Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, this, "foreground color");
connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
SLOT(changeForegroundColor(const QColor&)));
penColorPopupMenu->exec();
@@ -1878,7 +1878,7 @@ void Konsole::changeForegroundColor(const QColor &color)
qDebug("do other dialog");
#ifdef QT_QWS_OPIE
- OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color");
+ Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color");
connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
SLOT(changeBackgroundColor(const QColor&)));
penColorPopupMenu2->exec();
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index a6a079c..fe30b7e 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -21,17 +21,7 @@
#include "konsole.h"
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
-
-#include <qfile.h>
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <pwd.h>
-#include <sys/types.h>
+#include <opie2/oapplicationfactory.h>
/* --| main |------------------------------------------------------ */
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index 5807cd1..a338e19 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -4,7 +4,7 @@ Priority: optional
Section: opie/applications
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
-Depends: task-opie-minimal, libopie1, opie-keytabs
+Depends: task-opie-minimal, libopiecore2, libqtaux2, opie-keytabs
Description: KDE's konsole (shell terminal)
Ported to the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION