author | brad <brad> | 2004-04-05 13:42:55 (UTC) |
---|---|---|
committer | brad <brad> | 2004-04-05 13:42:55 (UTC) |
commit | 997a521a3ee84f614e2781a663911096ffb4a91a (patch) (unidiff) | |
tree | b54102f944af07bb0a8f3930ef856cbeff5f4899 /inputmethods/handwriting | |
parent | f31cf618522b8b8855c5905c20754f7d5a762be3 (diff) | |
download | opie-997a521a3ee84f614e2781a663911096ffb4a91a.zip opie-997a521a3ee84f614e2781a663911096ffb4a91a.tar.gz opie-997a521a3ee84f614e2781a663911096ffb4a91a.tar.bz2 |
Missed qWarning and deps
-rw-r--r-- | inputmethods/handwriting/config.in | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/handwriting.pro | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/qimpenchar.cpp | 4 | ||||
-rw-r--r-- | inputmethods/handwriting/qimpensetup.cpp | 3 |
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 @@ | |||
1 | config HANDWRITING | 1 | config HANDWRITING |
2 | boolean "opie-handwriting (Handwriting recognition)" | 2 | boolean "opie-handwriting (Handwriting recognition)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
5 | comment "opie-handwriting-classicset automatically selected" | 5 | comment "opie-handwriting-classicset automatically selected" |
6 | depends HANDWRITING | 6 | depends HANDWRITING |
7 | comment "opie-handwriting-graffitiset automatically selected" | 7 | comment "opie-handwriting-graffitiset automatically selected" |
8 | depends HANDWRITING | 8 | 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 \ | |||
24 | handwritingimpl.cpp | 24 | handwritingimpl.cpp |
25 | INTERFACES = qimpenprefbase.ui | 25 | INTERFACES = qimpenprefbase.ui |
26 | TARGET = qhandwriting | 26 | TARGET = qhandwriting |
27 | DESTDIR = ../../plugins/inputmethods | 27 | DESTDIR = ../../plugins/inputmethods |
28 | INCLUDEPATH += $(OPIEDIR)/include | 28 | INCLUDEPATH += $(OPIEDIR)/include |
29 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher | 29 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher |
30 | LIBS += -lqpe | 30 | LIBS += -lqpe -lopiecore2 |
31 | VERSION = 1.0.0 | 31 | VERSION = 1.0.0 |
32 | 32 | ||
33 | include ( $(OPIEDIR)/include.pro ) | 33 | include ( $(OPIEDIR)/include.pro ) |
34 | target.path = $$prefix/plugins/inputmethods | 34 | 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 ) | |||
389 | if ( file.status() == IO_Ok ) | 389 | if ( file.status() == IO_Ok ) |
390 | ok = TRUE; | 390 | ok = TRUE; |
391 | } | 391 | } |
392 | 392 | ||
393 | if ( ok ) { | 393 | if ( ok ) { |
394 | if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) { | 394 | if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) { |
395 | qWarning( "problem renaming file %s to %s, errno: %d", | 395 | owarn << "problem renaming file " <<tmpFn.latin1() << " to "<< fn.latin1() |
396 | tmpFn.latin1(), fn.latin1(), errno ); | 396 | << ", errno: " << errno << oendl; |
397 | // remove the tmp file, otherwise, it will just lay around... | 397 | // remove the tmp file, otherwise, it will just lay around... |
398 | QFile::remove( tmpFn.latin1() ); | 398 | QFile::remove( tmpFn.latin1() ); |
399 | ok = FALSE; | 399 | ok = FALSE; |
400 | } | 400 | } |
401 | } | 401 | } |
402 | 402 | ||
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 @@ | |||
33 | #include <qpixmap.h> | 33 | #include <qpixmap.h> |
34 | #include <qbuttongroup.h> | 34 | #include <qbuttongroup.h> |
35 | #include <qslider.h> | 35 | #include <qslider.h> |
36 | #include <qtabwidget.h> | 36 | #include <qtabwidget.h> |
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
39 | #include <opie2/odebug.h> | ||
39 | 40 | ||
40 | 41 | ||
41 | /* XPM */ | 42 | /* XPM */ |
42 | static const char * const left_xpm[] = { | 43 | static const char * const left_xpm[] = { |
43 | "16 16 2 1", | 44 | "16 16 2 1", |
44 | " c None", | 45 | " c None", |
@@ -105,13 +106,13 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, | |||
105 | this, SLOT(selectProfile(const QString&)) ); | 106 | this, SLOT(selectProfile(const QString&)) ); |
106 | hb->addWidget( profileCombo ); | 107 | hb->addWidget( profileCombo ); |
107 | #else | 108 | #else |
108 | profileList.append( profile ); | 109 | profileList.append( profile ); |
109 | #endif | 110 | #endif |
110 | 111 | ||
111 | qWarning("profiles: %d", profileList.count()); | 112 | owarn << "profiles: " << profileList.count() << oendl; |
112 | 113 | ||
113 | QTabWidget *tw = new QTabWidget( this ); | 114 | QTabWidget *tw = new QTabWidget( this ); |
114 | vb->addWidget( tw ); | 115 | vb->addWidget( tw ); |
115 | 116 | ||
116 | pref = new QIMPenPrefBase( this ); | 117 | pref = new QIMPenPrefBase( this ); |
117 | tw->addTab( pref, tr("Preferences") ); | 118 | tw->addTab( pref, tr("Preferences") ); |