summaryrefslogtreecommitdiff
authordrw <drw>2004-02-24 00:01:04 (UTC)
committer drw <drw>2004-02-24 00:01:04 (UTC)
commit99bcf9b87929dfba62449f6e365eff561ed3fab9 (patch) (unidiff)
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
@@ -3,2 +3,2 @@
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -29,3 +29,3 @@ SOURCES = TEScreen.cpp \
29 MyPty.cpp \ 29 MyPty.cpp \
30 main.cpp 30 main.cpp
31INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui 31INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui
@@ -34,3 +34,3 @@ INCLUDEPATH += $(OPIEDIR)/include
34DEPENDPATH += $(OPIEDIR)/include 34DEPENDPATH += $(OPIEDIR)/include
35LIBS += -lqpe -lopie 35LIBS += -lqpe -lopiecore2 -lqtaux2
36TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY 36TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
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
@@ -26,2 +26,6 @@
26 26
27#ifdef QT_QWS_OPIE
28#include <opie2/ocolorpopupmenu.h>
29#endif
30
27#include <qpe/resource.h> 31#include <qpe/resource.h>
@@ -65,6 +69,2 @@
65 69
66#ifdef QT_QWS_OPIE
67#include <opie/colorpopupmenu.h>
68#endif
69
70class EKNumTabBar : public QTabBar 70class EKNumTabBar : public QTabBar
@@ -1529,3 +1529,3 @@ void Konsole::colorMenuSelected(int iD)
1529 { 1529 {
1530 OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color"); 1530 Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, this, "foreground color");
1531 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, 1531 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
@@ -1880,3 +1880,3 @@ void Konsole::changeForegroundColor(const QColor &color)
1880 1880
1881 OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color"); 1881 Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color");
1882 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this, 1882 connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
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
@@ -23,13 +23,3 @@
23 23
24#include <qpe/qpeapplication.h> 24#include <opie2/oapplicationfactory.h>
25#include <opie/oapplicationfactory.h>
26
27#include <qfile.h>
28
29#include <unistd.h>
30#include <stdio.h>
31#include <stdlib.h>
32
33#include <pwd.h>
34#include <sys/types.h>
35 25
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
@@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal, libopie1, opie-keytabs 7Depends: task-opie-minimal, libopiecore2, libqtaux2, opie-keytabs
8Description: KDE's konsole (shell terminal) 8Description: KDE's konsole (shell terminal)