summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/handwriting/config.in2
-rw-r--r--inputmethods/handwriting/handwriting.pro2
-rw-r--r--inputmethods/handwriting/qimpenchar.cpp4
-rw-r--r--inputmethods/handwriting/qimpensetup.cpp3
4 files changed, 6 insertions, 5 deletions
diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in
index 3a5fddb..b4acc9a 100644
--- a/inputmethods/handwriting/config.in
+++ b/inputmethods/handwriting/config.in
@@ -1,8 +1,8 @@
config HANDWRITING
boolean "opie-handwriting (Handwriting recognition)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 )
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
comment "opie-handwriting-classicset automatically selected"
depends HANDWRITING
comment "opie-handwriting-graffitiset automatically selected"
depends HANDWRITING
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 3800381..e6f3b3f 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -24,11 +24,11 @@ SOURCES = qimpenchar.cpp \
handwritingimpl.cpp
INTERFACES = qimpenprefbase.ui
TARGET = qhandwriting
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
include ( $(OPIEDIR)/include.pro )
target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index db5d135..b83b2a4 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -389,14 +389,14 @@ bool QIMPenCharSet::save( Domain d )
if ( file.status() == IO_Ok )
ok = TRUE;
}
if ( ok ) {
if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) {
- qWarning( "problem renaming file %s to %s, errno: %d",
- tmpFn.latin1(), fn.latin1(), errno );
+ owarn << "problem renaming file " <<tmpFn.latin1() << " to "<< fn.latin1()
+ << ", errno: " << errno << oendl;
// remove the tmp file, otherwise, it will just lay around...
QFile::remove( tmpFn.latin1() );
ok = FALSE;
}
}
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp
index 3f4841d..564b6ba 100644
--- a/inputmethods/handwriting/qimpensetup.cpp
+++ b/inputmethods/handwriting/qimpensetup.cpp
@@ -33,12 +33,13 @@
#include <qpixmap.h>
#include <qbuttongroup.h>
#include <qslider.h>
#include <qtabwidget.h>
#include <qdir.h>
#include <qmessagebox.h>
+#include <opie2/odebug.h>
/* XPM */
static const char * const left_xpm[] = {
"16 16 2 1",
" c None",
@@ -105,13 +106,13 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent,
this, SLOT(selectProfile(const QString&)) );
hb->addWidget( profileCombo );
#else
profileList.append( profile );
#endif
- qWarning("profiles: %d", profileList.count());
+ owarn << "profiles: " << profileList.count() << oendl;
QTabWidget *tw = new QTabWidget( this );
vb->addWidget( tw );
pref = new QIMPenPrefBase( this );
tw->addTab( pref, tr("Preferences") );