summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt2
-rw-r--r--bin/kdepim/kaddressbook/usertranslation.txt2
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.h2
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp3
-rw-r--r--korganizer/wordsgerman.h2
-rw-r--r--pwmanager/pwmanager/pwm.cpp9
9 files changed, 13 insertions, 13 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index a5ba794..16c4178 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -140,7 +140,7 @@
140{ "Configure S&hortcuts...","Configure S&hortcuts..." }, 140{ "Configure S&hortcuts...","Configure S&hortcuts..." },
141{ "Show Jump Bar","Show Jump Bar" }, 141{ "Show Jump Bar","Show Jump Bar" },
142{ "Show Details","Show Details" }, 142{ "Show Details","Show Details" },
143{ "Beam receice enabled","Beam receice enabled" }, 143{ "Beam receive enabled","Beam receice enabled" },
144{ "Set Who Am I","Set Who Am I" }, 144{ "Set Who Am I","Set Who Am I" },
145{ "Set Categories","Set Categories" }, 145{ "Set Categories","Set Categories" },
146{ "Remove "voice"...","Remove "voice"..." }, 146{ "Remove "voice"...","Remove "voice"..." },
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt
index a5ba794..16c4178 100644
--- a/bin/kdepim/kaddressbook/usertranslation.txt
+++ b/bin/kdepim/kaddressbook/usertranslation.txt
@@ -140,7 +140,7 @@
140{ "Configure S&hortcuts...","Configure S&hortcuts..." }, 140{ "Configure S&hortcuts...","Configure S&hortcuts..." },
141{ "Show Jump Bar","Show Jump Bar" }, 141{ "Show Jump Bar","Show Jump Bar" },
142{ "Show Details","Show Details" }, 142{ "Show Details","Show Details" },
143{ "Beam receice enabled","Beam receice enabled" }, 143{ "Beam receive enabled","Beam receice enabled" },
144{ "Set Who Am I","Set Who Am I" }, 144{ "Set Who Am I","Set Who Am I" },
145{ "Set Categories","Set Categories" }, 145{ "Set Categories","Set Categories" },
146{ "Remove "voice"...","Remove "voice"..." }, 146{ "Remove "voice"...","Remove "voice"..." },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index 0236b92..f4c4698 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -868,7 +868,7 @@
868{ "Complete calendar...","Kompletten Kalender..." }, 868{ "Complete calendar...","Kompletten Kalender..." },
869{ "Filtered calendar...","Gefilterten Kalender..." }, 869{ "Filtered calendar...","Gefilterten Kalender..." },
870{ "Export to phone","Exportiere zum Handy" }, 870{ "Export to phone","Exportiere zum Handy" },
871{ "Beam receice enabled","Beam Empfang an" }, 871{ "Beam receive enabled","Beam Empfang an" },
872{ "What's new?","Was ist neu?" }, 872{ "What's new?","Was ist neu?" },
873{ "FAQ...","FAQ..." }, 873{ "FAQ...","FAQ..." },
874{ "Licence...","Licence..." }, 874{ "Licence...","Licence..." },
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 106596f..39d366b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -37,9 +37,7 @@ $Id$
37#include <qtextstream.h> 37#include <qtextstream.h>
38//#include <.h> 38//#include <.h>
39 39
40//#include <qpe/categories.h>
41#include <libkdepim/ksyncprofile.h> 40#include <libkdepim/ksyncprofile.h>
42//US #include <qpe/categoryselect.h>
43 41
44 42
45using namespace KABC; 43using namespace KABC;
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index d318ded..cb5b433 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -30,8 +30,6 @@ $Id$
30#include <qstring.h> 30#include <qstring.h>
31 31
32#include "addressee.h" 32#include "addressee.h"
33//#include <qpe/pim/contact.h>
34//#include <qpe/quuid.h>
35 33
36#include <xml/qdom.h> 34#include <xml/qdom.h>
37class Categories; 35class Categories;
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4ee3c3c..95fa541 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -43,8 +43,6 @@ $Id$
43#include <kstandarddirs.h> 43#include <kstandarddirs.h>
44#include <kmessagebox.h> 44#include <kmessagebox.h>
45 45
46#include <qpe/pim/addressbookaccess.h>
47
48 46
49#include "resourceqtopiaconfig.h" 47#include "resourceqtopiaconfig.h"
50#include "stdaddressbook.h" 48#include "stdaddressbook.h"
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index b2310c4..0505d0b 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -38,9 +38,6 @@ $Id$
38#include <qdir.h> 38#include <qdir.h>
39#include <qfile.h> 39#include <qfile.h>
40#include "resourceqtopia.h" 40#include "resourceqtopia.h"
41//US #include <qpe/qpeapplication.h>
42
43//US #include "stdaddressbook.h"
44 41
45#include "resourceqtopiaconfig.h" 42#include "resourceqtopiaconfig.h"
46 43
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index b2651d4..c5cae20 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -869,7 +869,7 @@
869{ "Complete calendar...","Kompletten Kalender..." }, 869{ "Complete calendar...","Kompletten Kalender..." },
870{ "Filtered calendar...","Gefilterten Kalender..." }, 870{ "Filtered calendar...","Gefilterten Kalender..." },
871{ "Export to phone","Exportiere zum Handy" }, 871{ "Export to phone","Exportiere zum Handy" },
872{ "Beam receice enabled","Beam Empfang an" }, 872{ "Beam receive enabled","Beam Empfang an" },
873{ "What's new?","Was ist neu?" }, 873{ "What's new?","Was ist neu?" },
874{ "FAQ...","FAQ..." }, 874{ "FAQ...","FAQ..." },
875{ "Licence...","Licence..." }, 875{ "Licence...","Licence..." },
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index ac0c978..9798e8e 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -40,6 +40,11 @@
40#include <kcmultidialog.h> 40#include <kcmultidialog.h>
41#endif 41#endif
42 42
43
44#ifndef DESKTOP_VERSION
45#include <qpe/global.h>
46#endif
47
43#include <qpixmap.h> 48#include <qpixmap.h>
44#include <qcheckbox.h> 49#include <qcheckbox.h>
45#include <qspinbox.h> 50#include <qspinbox.h>
@@ -165,6 +170,7 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
165 , forceQuit (false) 170 , forceQuit (false)
166 , forceMinimizeToTray (false) 171 , forceMinimizeToTray (false)
167{ 172{
173 virgin = !virginity;
168 init = _init; 174 init = _init;
169 connect(doc, SIGNAL(docClosed(PwMDoc *)), 175 connect(doc, SIGNAL(docClosed(PwMDoc *)),
170 this, SLOT(docClosed(PwMDoc *))); 176 this, SLOT(docClosed(PwMDoc *)));
@@ -1359,6 +1365,9 @@ void PwM::showStatMsg(const QString &msg)
1359 statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); 1365 statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
1360#else 1366#else
1361 qDebug("Statusbar : %s",msg.latin1()); 1367 qDebug("Statusbar : %s",msg.latin1());
1368#ifndef DESKTOP_VERSION
1369 Global::statusMessage(msg);
1370#endif
1362#endif 1371#endif
1363} 1372}
1364 1373