Input Methods -> ODP

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
@@ -1,6 +1,6 @@
   config DVORAK
     boolean "opie-dvorak (keyboard in DVORAK layout)"
     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
@@ -1,7 +1,7 @@
   config HANDWRITING
     boolean "opie-handwriting (Handwriting recognition)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
   comment "opie-handwriting-classicset automatically selected"
     depends HANDWRITING
   comment "opie-handwriting-graffitiset 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
@@ -1,4 +1,4 @@
   config JUMPX
     boolean "opie-jumpx (keyboard optimized for single finger/stylus input)"
     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
@@ -1,6 +1,6 @@
   config KEYBOARD
     boolean "opie-keyboard (keyboard in QWERTY layout)"
     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
@@ -1,4 +1,4 @@
   config KJUMPX
     boolean "opie-kjumpx (korean keyboard optimized for single finger/stylus input)"
     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
@@ -1,4 +1,4 @@
   config MULTIKEY
     boolean "opie-multikey (OnScreen keyboard for multiple languages)"
     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
@@ -26,13 +26,15 @@
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
-#include <opie/ofiledialog.h>
-#include <opie/colordialog.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/qcolordialog.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
+using namespace Opie;
+using namespace Opie::Ui;
 // ConfigDlg::ConfigDlg() {{{1
 ConfigDlg::ConfigDlg () : QDialog ()
 {
@@ -435,7 +437,7 @@ void ConfigDlg::keyColorClicked() {
 
     QStringList color = config.readListEntry("keycolor", QChar(','));
 
-    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()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
@@ -454,7 +456,7 @@ void ConfigDlg::keyColorPressedClicked() {
 
     QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
 
-    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()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
@@ -473,7 +475,7 @@ void ConfigDlg::keyColorLinesClicked() {
 
     QStringList color = config.readListEntry("keycolor_lines", QChar(','));
 
-    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()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
@@ -492,7 +494,7 @@ void ConfigDlg::textColorClicked() {
 
     QStringList color = config.readListEntry("textcolor", QChar(','));
 
-    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()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
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
@@ -10,7 +10,7 @@ TARGET		= qmultikey
 DESTDIR		= $(OPIEDIR)/plugins/inputmethods
 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
 VERSION		= 1.0.0
 
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
@@ -1,4 +1,4 @@
   config PICKBOARD
     boolean "opie-pickboard (lets you dictionary-based pick whole words based on partial input)"
     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
@@ -1,4 +1,4 @@
   config UNIKEYBOARD
     boolean "opie-unikeyboard (basic method to enter arbitrary unicode characters)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 )