| -rw-r--r-- | inputmethods/dvorak/config.in | 4 | ||||
| -rw-r--r-- | inputmethods/handwriting/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/jumpx/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/keyboard/config.in | 4 | ||||
| -rw-r--r-- | inputmethods/kjumpx/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/multikey/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/multikey/configdlg.cpp | 14 | ||||
| -rw-r--r-- | inputmethods/multikey/multikey.pro | 2 | ||||
| -rw-r--r-- | inputmethods/pickboard/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/unikeyboard/config.in | 2 |
10 files changed, 19 insertions, 17 deletions
diff --git a/inputmethods/dvorak/config.in b/inputmethods/dvorak/config.in index 13042b6..ed31b6a 100644 --- a/inputmethods/dvorak/config.in +++ b/inputmethods/dvorak/config.in @@ -3,4 +3,4 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD + depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD comment "opie-dvorak needs opie-pickboard" - depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD) + depends !(( LIBQPE || LIBQPE-X11 ) && PICKBOARD) diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in index 5aa4229..3a5fddb 100644 --- a/inputmethods/handwriting/config.in +++ b/inputmethods/handwriting/config.in @@ -3,3 +3,3 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) comment "opie-handwriting-classicset automatically selected" diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in index 8358fab..f2779f8 100644 --- a/inputmethods/jumpx/config.in +++ b/inputmethods/jumpx/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) diff --git a/inputmethods/keyboard/config.in b/inputmethods/keyboard/config.in index 6673439..0fbb535 100644 --- a/inputmethods/keyboard/config.in +++ b/inputmethods/keyboard/config.in @@ -3,4 +3,4 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD + depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD comment "opie-keyboard needs opie-pickboard" - depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD) + depends !(( LIBQPE || LIBQPE-X11 ) && PICKBOARD) diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in index 7ba966c..8ccef5b 100644 --- a/inputmethods/kjumpx/config.in +++ b/inputmethods/kjumpx/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in index b34bd3d..ad7d1e8 100644 --- a/inputmethods/multikey/config.in +++ b/inputmethods/multikey/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD + depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX2 && LIBOPIEUI2 diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index 3e39415..1fba9bc 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp @@ -28,4 +28,4 @@ #include <qtoolbutton.h> -#include <opie/ofiledialog.h> -#include <opie/colordialog.h> +#include <opie2/ofiledialog.h> +#include <opie2/qcolordialog.h> #include <qdir.h> @@ -35,2 +35,4 @@ +using namespace Opie; +using namespace Opie::Ui; // ConfigDlg::ConfigDlg() {{{1 @@ -437,3 +439,3 @@ void ConfigDlg::keyColorClicked() { - QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); + QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); @@ -456,3 +458,3 @@ void ConfigDlg::keyColorPressedClicked() { - QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); + QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); @@ -475,3 +477,3 @@ void ConfigDlg::keyColorLinesClicked() { - QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); + QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); @@ -494,3 +496,3 @@ void ConfigDlg::textColorClicked() { - QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); + QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro index 0901006..3a7de06 100644 --- a/inputmethods/multikey/multikey.pro +++ b/inputmethods/multikey/multikey.pro @@ -12,3 +12,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include ../../launcher -LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard +LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2 QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods diff --git a/inputmethods/pickboard/config.in b/inputmethods/pickboard/config.in index 376d3a7..96676fa 100644 --- a/inputmethods/pickboard/config.in +++ b/inputmethods/pickboard/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) diff --git a/inputmethods/unikeyboard/config.in b/inputmethods/unikeyboard/config.in index 923e941..e913bea 100644 --- a/inputmethods/unikeyboard/config.in +++ b/inputmethods/unikeyboard/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) |