summaryrefslogtreecommitdiff
Unidiff
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 @@
1 config EMBEDDEDKONSOLE 1 config EMBEDDEDKONSOLE
2 boolean "opie-embeddedkonsole (konsole from KDE adapted for Qt/Embedded)" 2 boolean "opie-embeddedkonsole (konsole from KDE adapted for Qt/Embedded)"
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
@@ -27,12 +27,12 @@ SOURCES = TEScreen.cpp \
27 commandeditwidget.cpp \ 27 commandeditwidget.cpp \
28 playlistselection.cpp \ 28 playlistselection.cpp \
29 MyPty.cpp \ 29 MyPty.cpp \
30 main.cpp 30 main.cpp
31INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui 31INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui
32TARGET = embeddedkonsole 32TARGET = embeddedkonsole
33INCLUDEPATH += $(OPIEDIR)/include 33INCLUDEPATH += $(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
37 37
38include ( $(OPIEDIR)/include.pro ) 38include ( $(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 @@
24 24
25#include <stdlib.h> 25#include <stdlib.h>
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>
28 32
29#include <qdir.h> 33#include <qdir.h>
@@ -63,10 +67,6 @@
63#include "keytrans.h" 67#include "keytrans.h"
64#include "commandeditdialog.h" 68#include "commandeditdialog.h"
65 69
66#ifdef QT_QWS_OPIE
67#include <opie/colorpopupmenu.h>
68#endif
69
70class EKNumTabBar : public QTabBar 70class EKNumTabBar : public QTabBar
71{ 71{
72public: 72public:
@@ -1527,7 +1527,7 @@ void Konsole::colorMenuSelected(int iD)
1527 qDebug("do custom"); 1527 qDebug("do custom");
1528 if(fromMenu) 1528 if(fromMenu)
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,
1532 SLOT(changeForegroundColor(const QColor&))); 1532 SLOT(changeForegroundColor(const QColor&)));
1533 penColorPopupMenu->exec(); 1533 penColorPopupMenu->exec();
@@ -1878,7 +1878,7 @@ void Konsole::changeForegroundColor(const QColor &color)
1878 qDebug("do other dialog"); 1878 qDebug("do other dialog");
1879#ifdef QT_QWS_OPIE 1879#ifdef QT_QWS_OPIE
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,
1883 SLOT(changeBackgroundColor(const QColor&))); 1883 SLOT(changeBackgroundColor(const QColor&)));
1884 penColorPopupMenu2->exec(); 1884 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 @@
21 21
22#include "konsole.h" 22#include "konsole.h"
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
36 26
37/* --| main |------------------------------------------------------ */ 27/* --| 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
4Section: opie/applications 4Section: opie/applications
5Maintainer: L.J. Potter <lpotter@trolltech.com> 5Maintainer: 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)
9 Ported to the Opie environment. 9 Ported to the Opie environment.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION