summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/alarmcalendar.cpp6
-rw-r--r--kalarm/birthdaydlg.cpp4
-rw-r--r--kalarm/calendarcompat.cpp2
-rw-r--r--kalarm/daemon.cpp20
-rw-r--r--kalarm/functions.cpp12
-rw-r--r--kalarm/kalarmapp.cpp4
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp10
-rw-r--r--kalarm/kamail.cpp8
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/mainwindow.cpp2
-rw-r--r--kalarm/mainwindowbase.cpp2
-rw-r--r--kalarm/messagewin.cpp12
-rw-r--r--kalarm/prefdlg.cpp4
-rw-r--r--kalarm/traywindow.cpp4
-rw-r--r--kalarm/undo.cpp2
15 files changed, 47 insertions, 47 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index f47e962cf..9379ea07d 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
*/
bool AlarmCalendar::initialiseCalendars()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
TQString activeKey = TQString::fromLatin1("Calendar");
TQString expiredKey = TQString::fromLatin1("ExpiredCalendar");
@@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
// Save the change in the config file.
if (!mConfigKey.isNull())
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writePathEntry(mConfigKey, mICalUrl.path());
config->sync();
@@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal()
{
if (!mConfigKey.isNull())
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writePathEntry(mConfigKey, mICalUrl.path());
config->sync();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 0a1cd1576..6ebe07a67 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -80,7 +80,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
// Prefix and suffix to the name in the alarm text
// Get default prefix and suffix texts from config file
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
@@ -343,7 +343,7 @@ TQValueList<KAEvent> BirthdayDlg::events() const
void BirthdayDlg::slotOk()
{
// Save prefix and suffix texts to use as future defaults
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index 9a5aca37a..cc7431f99 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -86,7 +86,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
{
// Older versions used KAlarm's translated name in the product ID, which
// could have created problems using a calendar in different locales.
- progname = TQString(" ") + kapp->aboutData()->programName() + ' ';
+ progname = TQString(" ") + tdeApp->aboutData()->programName() + ' ';
i = prodid.find(progname, 0, false);
if (i < 0)
return 0; // calendar wasn't created by KAlarm
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 06206cc93..1614b8614 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -188,12 +188,12 @@ bool Daemon::registerWith(bool reregister)
bool disabledIfStopped = theApp()->alarmsDisabledIfStopped();
kdDebug(5950) << (reregister ? "Daemon::reregisterWith(): " : "Daemon::registerWith(): ") << (disabledIfStopped ? "NO_START" : "COMMAND_LINE") << endl;
- TQCString appname = kapp->aboutData()->appName();
+ TQCString appname = tdeApp->aboutData()->appName();
AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
if (reregister)
s.registerChange(appname, !disabledIfStopped);
else
- s.registerApp(appname, kapp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
+ s.registerApp(appname, tdeApp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
if (!s.ok())
{
kdError(5950) << "Daemon::registerWith(" << reregister << "): DCOP error" << endl;
@@ -233,11 +233,11 @@ void Daemon::registrationResult(bool reregister, int result, int version)
// We've successfully registered with the daemon, but the daemon can't
// find the KAlarm executable so won't be able to restart KAlarm if
// KAlarm exits.
- kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
+ kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n";
KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
"(Installation or configuration error: %1 cannot locate %2 executable.)")
.arg(TQString::fromLatin1(DAEMON_APP_NAME))
- .arg(kapp->aboutData()->appName()));
+ .arg(tdeApp->aboutData()->appName()));
break;
case KAlarmd::FAILURE:
default:
@@ -314,7 +314,7 @@ void Daemon::checkIfStarted()
*/
void Daemon::updateRegisteredStatus(bool timeout)
{
- if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+ if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
{
mStatus = STOPPED;
mRegisterFailMsg = false;
@@ -350,7 +350,7 @@ void Daemon::updateRegisteredStatus(bool timeout)
bool Daemon::stop()
{
kdDebug(5950) << "Daemon::stop()" << endl;
- if (kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+ if (tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
{
AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
s.quit();
@@ -371,10 +371,10 @@ bool Daemon::stop()
bool Daemon::reset()
{
kdDebug(5950) << "Daemon::reset()" << endl;
- if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+ if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
return false;
AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
- s.resetCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+ s.resetCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
if (!s.ok())
kdError(5950) << "Daemon::reset(): resetCalendar dcop send failed" << endl;
return true;
@@ -387,7 +387,7 @@ void Daemon::reload()
{
kdDebug(5950) << "Daemon::reload()\n";
AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
- s.reloadCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+ s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
if (!s.ok())
kdError(5950) << "Daemon::reload(): reloadCalendar dcop send failed" << endl;
}
@@ -635,7 +635,7 @@ void Daemon::notifyEventHandled(const TQString& eventId, bool reloadCal)
{
kdDebug(5950) << "Daemon::notifyEventHandled(" << eventId << (reloadCal ? "): reload" : ")") << endl;
AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
- s.eventHandled(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
+ s.eventHandled(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
if (!s.ok())
kdError(5950) << "Daemon::notifyEventHandled(): eventHandled dcop send failed" << endl;
}
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index d91d65ae0..d3e85a623 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -718,7 +718,7 @@ TQString runKMail(bool minimise)
*/
bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
{
- if (!kapp->dcopClient()->isApplicationRegistered(program))
+ if (!tdeApp->dcopClient()->isApplicationRegistered(program))
{
// KOrganizer is not already running, so start it
if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
@@ -729,7 +729,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
// Minimise its window - don't use hide() since this would remove all
// trace of it from the panel if it is not configured to be docked in
// the system tray.
- kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString());
+ tdeApp->dcopClient()->send(dcopName, windowName, "minimize()", TQString());
}
else if (dcopName.isEmpty())
dcopName = program;
@@ -981,7 +981,7 @@ kdDebug(5950)<<"Korg->"<<iCal<<endl;
TQCString replyType;
TQDataStream arg(data, IO_WriteOnly);
arg << iCal;
- if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData)
+ if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData)
&& replyType == "bool")
{
bool result;
@@ -1009,7 +1009,7 @@ bool deleteFromKOrganizer(const TQString& eventID)
TQCString replyType;
TQDataStream arg(data, IO_WriteOnly);
arg << newID << true;
- if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData)
+ if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData)
&& replyType == "bool")
{
bool result;
@@ -1042,7 +1042,7 @@ bool runKOrganizer()
// to load KOrganizer into Kontact. But if KOrganizer is running independently,
// the load() method doesn't exist.
TQCString dummy;
- if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+ if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
{
DCOPRef ref(dcopService, dcopService); // talk to the TDEUniqueApplication or its Kontact wrapper
DCOPReply reply = ref.call("load()");
@@ -1051,7 +1051,7 @@ bool runKOrganizer()
kdWarning(5950) << "Error loading " << dcopService << endl;
return false;
}
- if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+ if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
{
kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl;
return false;
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 0d93b94f2..ed367f2e0 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -120,7 +120,7 @@ KAlarmApp::KAlarmApp()
{
connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged()));
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
mNoSystemTray = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
mSavedNoSystemTray = mNoSystemTray;
@@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray()
// daemon with the correct NOTIFY type. If that happened when there was no system
// tray and alarms are disabled when KAlarm is not running, registering with
// NO_START_NOTIFY could result in alarms never being seen.
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(TQString::fromLatin1("General"));
config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
config->sync();
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 5f4fbba81..4f8066610 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -89,7 +89,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
if (autostart)
{
bool done = false;
- DCOPClient* client = kapp->dcopClient();
+ DCOPClient* client = tdeApp->dcopClient();
if (client->isApplicationRegistered("ksmserver"))
{
TQByteArray callData;
@@ -98,7 +98,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i)
{
// Check if the session has been fully created/restored. If not, wait a little and try again
- if (!kapp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
+ if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
replyType != "bool")
{
done = true; // In case of DCOP call error, just continue normally
@@ -512,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon
// Check if the client application is running and ready to receive notification
- bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
+ bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
bool ready = registered;
if (registered)
{
// It's running, but check if it has created our DCOP interface yet
- QCStringList objects = kapp->dcopClient()->remoteObjects(appname);
+ QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname);
if (objects.find(client->dcopObject()) == objects.end())
ready = false;
}
@@ -606,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
if (!client)
return;
TQCString appname = client->appName();
- if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
+ if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
{
KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
: KAlarmd::CALENDAR_UNAVAILABLE;
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 82eb008b4..862160be0 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -242,7 +242,7 @@ TQString KAMail::sendKMail(const KAMailData& data)
// KMail is now running. Determine which DCOP call to use.
bool useSend = false;
TQCString sendFunction = "sendMessage(TQString,TQString,TQString,TQString,TQString,TQString,KURL::List)";
- QCStringList funcs = kapp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface");
+ QCStringList funcs = tdeApp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface");
for (QCStringList::Iterator it=funcs.begin(); it != funcs.end() && !useSend; ++it)
{
TQCString func = DCOPClient::normalizeFunctionSignature(*it);
@@ -337,7 +337,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons
{
TQCString replyType;
TQByteArray replyData;
- if (!kapp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData)
+ if (!tdeApp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData)
|| replyType != funcType)
{
TQCString funcname = function;
@@ -394,7 +394,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
if (!data.bcc.isEmpty())
message += TQString::fromLatin1("\nBcc: ") + data.bcc;
message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject();
- message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
+ message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(tdeApp->aboutData()->programName());
return message;
}
@@ -943,7 +943,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
arg << serialNumber;
arg << (int)0;
TQString body;
- if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
+ if (tdeApp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
&& replyType == "TQString")
{
TQDataStream reply_stream(replyData, IO_ReadOnly);
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 0fe0159bd..97d89fee8 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -201,7 +201,7 @@ bool ShellProcess::authorised()
{
if (!mInitialised)
{
- mAuthorised = kapp->authorize("shell_access");
+ mAuthorised = tdeApp->authorize("shell_access");
mInitialised = true;
}
return mAuthorised;
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 66a93a9ca..77d86e09b 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -124,7 +124,7 @@ MainWindow::MainWindow(bool restored)
{
kdDebug(5950) << "MainWindow::MainWindow()\n";
setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc.
- setPlainCaption(kapp->aboutData()->programName());
+ setPlainCaption(tdeApp->aboutData()->programName());
TDEConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false);
diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp
index 3d30a5ba1..78dac9fad 100644
--- a/kalarm/mainwindowbase.cpp
+++ b/kalarm/mainwindowbase.cpp
@@ -43,7 +43,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce)
bool MainWindowBase::queryExit()
{
#if KDE_IS_VERSION(3,1,90)
- if (kapp->sessionSaving())
+ if (tdeApp->sessionSaving())
return true;
#endif
return disableQuit ? false : TDEMainWindow::queryExit();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index ef83847db..5c15fcd6e 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -576,7 +576,7 @@ void MessageWin::initView()
mKMailButton = 0;
// KAlarm button
- TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), TDEIcon::MainToolbar);
+ TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(tdeApp->aboutData()->appName()), TDEIcon::MainToolbar);
mKAlarmButton = new TQPushButton(topWidget);
mKAlarmButton->setPixmap(pixmap);
mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
@@ -813,12 +813,12 @@ void MessageWin::playAudio()
*/
void MessageWin::slotSpeak()
{
- DCOPClient* client = kapp->dcopClient();
+ DCOPClient* client = tdeApp->dcopClient();
if (!client->isApplicationRegistered("kttsd"))
{
// kttsd is not running, so start it
TQString error;
- if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+ if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error))
{
kdDebug(5950) << "MessageWin::slotSpeak(): failed to start kttsd: " << error << endl;
if (!haveErrorMessage(ErrMsg_Speak))
@@ -1117,7 +1117,7 @@ int MessageWin::getKMixVolume()
TQByteArray data, replyData;
TQCString replyType;
TQDataStream arg(data, IO_WriteOnly);
- if (!kapp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData)
+ if (!tdeApp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData)
|| replyType != "int")
return -1;
int result;
@@ -1138,7 +1138,7 @@ void MessageWin::setKMixVolume(int percent)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << percent;
- if (!kapp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data))
+ if (!tdeApp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data))
kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed\n";
}
#endif
@@ -1438,7 +1438,7 @@ void MessageWin::slotShowKMailMessage()
TQByteArray data, replyData;
TQDataStream arg(data, IO_WriteOnly);
arg << (TQ_UINT32)mKMailSerialNumber << TQString();
- if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
+ if (tdeApp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
&& replyType == "bool")
{
bool result;
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 38cd56034..59b903dc5 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -159,7 +159,7 @@ void KAlarmPrefDlg::slotDefault()
void KAlarmPrefDlg::slotHelp()
{
- kapp->invokeHelp("preferences");
+ tdeApp->invokeHelp("preferences");
}
// Apply the preferences that are currently selected
@@ -399,7 +399,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
mXtermType->insert(radio, mXtermCount);
if (mXtermFirst < 0)
mXtermFirst = mXtermCount; // note the id of the first button
- cmd.replace("%t", kapp->aboutData()->programName());
+ cmd.replace("%t", tdeApp->aboutData()->programName());
cmd.replace("%c", "<command>");
cmd.replace("%w", "<command; sleep>");
cmd.replace("%C", "[command]");
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 90bd92edd..77b964d20 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -351,9 +351,9 @@ void TrayTooltip::maybeTip(const TQPoint&)
TrayWindow* parent = (TrayWindow*)parentWidget();
TQString text;
if (Daemon::monitoringAlarms())
- text = kapp->aboutData()->programName();
+ text = tdeApp->aboutData()->programName();
else
- text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
+ text = i18n("%1 - disabled").arg(tdeApp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
parent->tooltipAlarmText(text);
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 38d152c79..1e6d3b0f1 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -207,7 +207,7 @@ Undo::List Undo::mRedoList;
Undo* Undo::instance()
{
if (!mInstance)
- mInstance = new Undo(kapp);
+ mInstance = new Undo(tdeApp);
return mInstance;
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-22 06:59:15 +0000