diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kalarm/functions.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/functions.cpp')
| -rw-r--r-- | kalarm/functions.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 97d046896..26b16d226 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -633,7 +633,7 @@ void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event) if (event && event->action() == KAEvent::EMAIL && Preferences::emailAddress().isEmpty()) KMessageBox::information(tqparent, i18n("Please set the 'From' email address...", - "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress())); + "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress())); if (!Daemon::monitoringAlarms()) { @@ -705,7 +705,7 @@ TQString runKMail(bool minimise) TQCString dcopName; TQString errmsg; if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg)) - return i18n("Unable to start KMail\n(%1)").arg(errmsg); + return i18n("Unable to start KMail\n(%1)").tqarg(errmsg); return TQString(); } @@ -747,9 +747,9 @@ bool readConfigWindowSize(const char* window, TQSize& result) { KConfig* config = KGlobal::config(); config->setGroup(TQString::tqfromLatin1(window)); - TQWidget* desktop = KApplication::desktop(); - TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), 0), - config->readNumEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), 0)); + TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); + TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), 0), + config->readNumEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), 0)); if (s.isEmpty()) return false; result = s; @@ -764,9 +764,9 @@ void writeConfigWindowSize(const char* window, const TQSize& size) { KConfig* config = KGlobal::config(); config->setGroup(TQString::tqfromLatin1(window)); - TQWidget* desktop = KApplication::desktop(); - config->writeEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), size.width()); - config->writeEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), size.height()); + TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); + config->writeEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), size.width()); + config->writeEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), size.height()); config->sync(); } |