summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/alarmlistview.cpp2
-rw-r--r--kalarm/birthdaydlg.cpp2
-rw-r--r--kalarm/functions.cpp6
-rw-r--r--kalarm/kalarmapp.cpp18
-rw-r--r--kalarm/kalarmapp.h4
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp10
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
-rw-r--r--kalarm/lib/dateedit.cpp2
-rw-r--r--kalarm/lib/datetime.cpp4
-rw-r--r--kalarm/lib/lineedit.cpp4
-rw-r--r--kalarm/lib/messagebox.cpp4
-rw-r--r--kalarm/lib/shellprocess.cpp12
-rw-r--r--kalarm/lib/shellprocess.h4
-rw-r--r--kalarm/lib/timeedit.cpp6
-rw-r--r--kalarm/mainwindow.cpp22
-rw-r--r--kalarm/messagewin.cpp4
-rw-r--r--kalarm/preferences.cpp12
-rw-r--r--kalarm/recurrenceedit.cpp10
-rw-r--r--kalarm/sounddlg.cpp2
-rw-r--r--kalarm/soundpicker.cpp2
-rw-r--r--kalarm/traywindow.cpp2
21 files changed, 68 insertions, 68 deletions
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index ed509816f..bf90dd864 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -493,7 +493,7 @@ TQString AlarmListViewItem::alarmText(const KAEvent& event) const
*/
TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
{
- KLocale* locale = KGlobal::locale();
+ KLocale* locale = TDEGlobal::locale();
TQString dateTimeText = locale->formatDate(dateTime.date(), true);
if (!dateTime.isDateOnly())
{
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 60430a632..b12a41cfb 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -401,7 +401,7 @@ AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQD
mBirthday(birthday)
{
setText(NAME, name);
- setText(BIRTHDAY, KGlobal::locale()->formatDate(mBirthday, true));
+ setText(BIRTHDAY, TDEGlobal::locale()->formatDate(mBirthday, true));
mBirthdayOrder.sprintf("%04d%03d", mBirthday.year(), mBirthday.dayOfYear());
}
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index e5dc5fa38..da43fdad6 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -745,7 +745,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
*/
bool readConfigWindowSize(const char* window, TQSize& result)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
@@ -762,7 +762,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
*/
void writeConfigWindowSize(const char* window, const TQSize& size)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
@@ -894,7 +894,7 @@ int localeFirstDayOfWeek()
{
static int firstDay = 0;
if (!firstDay)
- firstDay = KGlobal::locale()->weekStartDay();
+ firstDay = TDEGlobal::locale()->weekStartDay();
return firstDay;
}
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 3792a580f..1d315e342 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -1697,7 +1697,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& event, const KAAlarm* alarm, int flags)
{
kdDebug(5950) << "KAlarmApp::doShellCommand(" << command << ", " << event.id() << ")" << endl;
- KProcess::Communication comms = KProcess::NoCommunication;
+ TDEProcess::Communication comms = TDEProcess::NoCommunication;
TQString cmd;
TQString tmpXtermFile;
if (flags & ProcData::EXEC_IN_XTERM)
@@ -1748,26 +1748,26 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
else
{
cmd = command;
- comms = KProcess::AllOutput;
+ comms = TDEProcess::AllOutput;
}
ShellProcess* proc = new ShellProcess(cmd);
connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*)));
TQGuardedPtr<ShellProcess> logproc = 0;
- if (comms == KProcess::AllOutput && !event.logFile().isEmpty())
+ if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty())
{
// Output is to be appended to a log file.
// Set up a logging process to write the command's output to.
- connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
- connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
+ connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
+ connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
- logproc->start(KProcess::Stdin);
+ logproc->start(TDEProcess::Stdin);
TQCString heading;
if (alarm && alarm->dateTime().isValid())
{
TQString dateTime = alarm->dateTime().isDateOnly()
- ? KGlobal::locale()->formatDate(alarm->dateTime().date(), true)
- : KGlobal::locale()->formatDateTime(alarm->dateTime().dateTime());
+ ? TDEGlobal::locale()->formatDate(alarm->dateTime().date(), true)
+ : TDEGlobal::locale()->formatDateTime(alarm->dateTime().dateTime());
heading.sprintf("\n******* KAlarm %s *******\n", dateTime.latin1());
}
else
@@ -1822,7 +1822,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe
/******************************************************************************
* Called when an executing command alarm sends output to stdout or stderr.
*/
-void KAlarmApp::slotCommandOutput(KProcess* proc, char* buffer, int bufflen)
+void KAlarmApp::slotCommandOutput(TDEProcess* proc, char* buffer, int bufflen)
{
//kdDebug(5950) << "KAlarmApp::slotCommandOutput(): '" << TQCString(buffer, bufflen+1) << "'\n";
// Find this command in the command list
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 22e51324b..852143edf 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -29,7 +29,7 @@ class TQDateTime;
#include <kuniqueapplication.h>
#include <kurl.h>
-class KProcess;
+class TDEProcess;
namespace KCal { class Event; }
#include "alarmevent.h"
@@ -99,7 +99,7 @@ class KAlarmApp : public KUniqueApplication
private slots:
void quitFatal();
void slotPreferencesChanged();
- void slotCommandOutput(KProcess*, char* buffer, int bufflen);
+ void slotCommandOutput(TDEProcess*, char* buffer, int bufflen);
void slotLogProcExited(ShellProcess*);
void slotCommandExited(ShellProcess*);
void slotSystemTrayTimer();
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index 06ee4597e..e6211076e 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -48,7 +48,7 @@ void ADConfigData::readConfig()
{
kdDebug(5900) << "ADConfigData::readConfig()" << endl;
ClientInfo::clear();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH);
for (TQStringList::Iterator cl = clients.begin(); cl != clients.end(); ++cl)
{
@@ -101,7 +101,7 @@ void ADConfigData::readConfig()
*/
void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writeEntry(TITLE_KEY, cinfo->title());
config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
@@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
*/
void ADConfigData::removeClient(const TQCString& appName)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->sync();
}
@@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName)
*/
void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writePathEntry(CALENDAR_KEY, cal->urlString());
config->sync();
@@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
void ADConfigData::enableAutoStart(bool on)
{
kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->reparseConfiguration();
config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index e1bbe0bb5..8fd34b114 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -503,7 +503,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
}
// Start KAlarm, using the command line to specify the alarm
- KProcess p;
+ TDEProcess p;
TQString cmd = locate("exe", appname);
if (cmd.isEmpty())
{
@@ -512,7 +512,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
}
p << cmd;
p << "--handleEvent" << id << "--calendarURL" << calendar->urlString();
- p.start(KProcess::DontCare);
+ p.start(TDEProcess::DontCare);
kdDebug(5900) << "AlarmDaemon::notifyEvent(): used command line" << endl;
return true;
}
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 2fef25de5..09712beda 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -80,7 +80,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
if (limit == TQDate::currentDate())
errString = i18n("today");
else
- errString = KGlobal::locale()->formatDate(limit, true);
+ errString = TDEGlobal::locale()->formatDate(limit, true);
errString = defaultError.arg(errString);
}
KMessageBox::sorry(this, errString);
diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp
index e9dae4140..bc6e64394 100644
--- a/kalarm/lib/datetime.cpp
+++ b/kalarm/lib/datetime.cpp
@@ -39,9 +39,9 @@ TQDateTime DateTime::dateTime() const
TQString DateTime::formatLocale(bool shortFormat) const
{
if (mDateOnly)
- return KGlobal::locale()->formatDate(mDateTime.date(), shortFormat);
+ return TDEGlobal::locale()->formatDate(mDateTime.date(), shortFormat);
else if (mTimeValid)
- return KGlobal::locale()->formatDateTime(mDateTime, shortFormat);
+ return TDEGlobal::locale()->formatDateTime(mDateTime, shortFormat);
else
return TQString();
}
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 6b5787ebf..1db384d3c 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -61,14 +61,14 @@ void LineEdit::init()
{
if (mType == Url)
{
- setCompletionMode(KGlobalSettings::CompletionShell);
+ setCompletionMode(TDEGlobalSettings::CompletionShell);
KURLCompletion* comp = new KURLCompletion(KURLCompletion::FileCompletion);
comp->setReplaceHome(true);
setCompletionObject(comp);
setAutoDeleteCompletionObject(true);
}
else
- setCompletionMode(KGlobalSettings::CompletionNone);
+ setCompletionMode(TDEGlobalSettings::CompletionNone);
}
/******************************************************************************
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 48c18f1cd..c58287bec 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
if (dontShowAgainName.isEmpty())
return false;
// First check whether there is an existing setting
- KConfig* config = mConfig ? mConfig : KGlobal::config();
+ KConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
if (config->hasKey(dontShowAgainName))
return false;
@@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
{
if (dontShowAgainName.isEmpty())
return;
- KConfig* config = mConfig ? mConfig : KGlobal::config();
+ KConfig* config = mConfig ? mConfig : TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Notification Messages"));
bool global = (dontShowAgainName[0] == ':');
if (yesno)
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index b3df822e8..94666d532 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -56,9 +56,9 @@ bool ShellProcess::start(Communication comm)
return false;
}
KShellProcess::operator<<(mCommand);
- connect(this, TQT_SIGNAL(wroteStdin(KProcess*)), TQT_SLOT(writtenStdin(KProcess*)));
- connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*)));
- if (!KShellProcess::start(KProcess::NotifyOnExit, comm))
+ connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*)));
+ connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*)));
+ if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm))
{
mStatus = START_FAIL;
return false;
@@ -72,7 +72,7 @@ bool ShellProcess::start(Communication comm)
* Interprets the exit status according to which shell was called, and emits
* a shellExited() signal.
*/
-void ShellProcess::slotExited(KProcess* proc)
+void ShellProcess::slotExited(TDEProcess* proc)
{
kdDebug(5950) << "ShellProcess::slotExited()\n";
mStdinQueue.clear();
@@ -105,7 +105,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen)
bool write = mStdinQueue.isEmpty();
mStdinQueue.append(scopy);
if (write)
- KProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length());
+ TDEProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length());
}
/******************************************************************************
@@ -114,7 +114,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen)
* Note that buffers written to STDIN must not be freed until the writtenStdin()
* signal has been processed.
*/
-void ShellProcess::writtenStdin(KProcess* proc)
+void ShellProcess::writtenStdin(TDEProcess* proc)
{
mStdinQueue.pop_front(); // free the buffer which has now been written
if (!mStdinQueue.isEmpty())
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index 8c577d85b..3b198028d 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -116,8 +116,8 @@ class ShellProcess : public KShellProcess
void shellExited(ShellProcess*);
private slots:
- void writtenStdin(KProcess*);
- void slotExited(KProcess*);
+ void writtenStdin(TDEProcess*);
+ void slotExited(TDEProcess*);
private:
// Prohibit the following inherited methods
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 01152fcee..67a846d7a 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -35,7 +35,7 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
mPmIndex(-1),
mReadOnly(false)
{
- bool use12hour = KGlobal::locale()->use12Clock();
+ bool use12hour = TDEGlobal::locale()->use12Clock();
mSpinBox = new TimeSpinBox(!use12hour, this);
mSpinBox->setFixedSize(mSpinBox->sizeHint());
connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
@@ -174,7 +174,7 @@ void TimeEdit::setAmPmCombo(int am, int pm)
{
// Insert "am"
mAmIndex = 0;
- mAmPm->insertItem(KGlobal::locale()->translate("am"), mAmIndex);
+ mAmPm->insertItem(TDEGlobal::locale()->translate("am"), mAmIndex);
if (mPmIndex >= 0)
mPmIndex = 1;
mAmPm->setCurrentItem(mPmIndex >= 0 ? mPmIndex : mAmIndex);
@@ -193,7 +193,7 @@ void TimeEdit::setAmPmCombo(int am, int pm)
{
// Insert "pm"
mPmIndex = mAmIndex + 1;
- mAmPm->insertItem(KGlobal::locale()->translate("pm"), mPmIndex);
+ mAmPm->insertItem(TDEGlobal::locale()->translate("pm"), mPmIndex);
if (mAmIndex < 0)
mAmPm->setCurrentItem(mPmIndex);
}
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index e9445d43a..e4462db5c 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -125,7 +125,7 @@ MainWindow::MainWindow(bool restored)
kdDebug(5950) << "MainWindow::MainWindow()\n";
setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc.
setPlainCaption(kapp->aboutData()->programName());
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false);
mShowTime = config->readBoolEntry(SHOW_TIME_KEY, true);
@@ -190,8 +190,8 @@ MainWindow::~MainWindow()
KAlarm::writeConfigWindowSize(WINDOW_NAME, main->size());
KToolBar* tb = toolBar();
if (tb)
- tb->saveSettings(KGlobal::config(), "Toolbars");
- KGlobal::config()->sync(); // save any new window size to disc
+ tb->saveSettings(TDEGlobal::config(), "Toolbars");
+ TDEGlobal::config()->sync(); // save any new window size to disc
theApp()->quitIf();
}
@@ -314,7 +314,7 @@ void MainWindow::hideEvent(TQHideEvent* he)
*/
void MainWindow::columnsReordered()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(WINDOW_NAME));
config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
config->sync();
@@ -412,7 +412,7 @@ void MainWindow::initActions()
KToolBar* tb = toolBar();
if (tb)
- tb->applySettings(KGlobal::config(), "Toolbars");
+ tb->applySettings(TDEGlobal::config(), "Toolbars");
Undo::emitChanged(); // set the Undo/Redo menu texts
Daemon::checkStatus();
@@ -792,7 +792,7 @@ void MainWindow::slotShowTime()
else
{
mListView->selectTimeColumns(mShowTime, mShowTimeTo);
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_TIME_KEY, mShowTime);
config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -811,7 +811,7 @@ void MainWindow::slotShowTimeTo()
else
{
mListView->selectTimeColumns(mShowTime, mShowTimeTo);
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_TIME_KEY, mShowTime);
config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -829,7 +829,7 @@ void MainWindow::slotShowExpired()
mActionShowExpired->setToolTip(mShowExpired ? i18n_HideExpiredAlarms() : i18n_ShowExpiredAlarms());
mListView->showExpired(mShowExpired);
mListView->refresh();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(VIEW_GROUP);
config->writeEntry(SHOW_ARCHIVED_KEY, mShowExpired);
}
@@ -1086,7 +1086,7 @@ void MainWindow::slotConfigureKeys()
*/
void MainWindow::slotConfigureToolbar()
{
- saveMainWindowSettings(KGlobal::config(), WINDOW_NAME);
+ saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME);
KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
@@ -1099,7 +1099,7 @@ void MainWindow::slotConfigureToolbar()
void MainWindow::slotNewToolbarConfig()
{
createGUI(UI_FILE);
- applyMainWindowSettings(KGlobal::config(), WINDOW_NAME);
+ applyMainWindowSettings(TDEGlobal::config(), WINDOW_NAME);
}
/******************************************************************************
@@ -1258,7 +1258,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
dt.setTime_t(summary.date());
TQString body = KAMail::getMailBody(summary.serialNumber());
alarmText.setEmail(summary.to(), summary.from(), TQString(),
- KGlobal::locale()->formatDateTime(dt), summary.subject(),
+ TDEGlobal::locale()->formatDateTime(dt), summary.subject(),
body, summary.serialNumber());
}
else if (KCal::ICalDrag::decode(e, &calendar))
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 2c9ac63e4..3e63853ea 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -310,8 +310,8 @@ void MessageWin::initView()
// Alarm date/time
TQLabel* label = new TQLabel(frame ? frame : topWidget);
label->setText(mDateTime.isDateOnly()
- ? KGlobal::locale()->formatDate(mDateTime.date(), true)
- : KGlobal::locale()->formatDateTime(mDateTime.dateTime()));
+ ? TDEGlobal::locale()->formatDate(mDateTime.date(), true)
+ : TDEGlobal::locale()->formatDateTime(mDateTime.dateTime()));
if (!frame)
label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
label->setFixedSize(label->sizeHint());
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 3daf433fe..c77c72f1c 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -214,7 +214,7 @@ void Preferences::initialise()
{
// Initialise static variables here to avoid static initialisation
// sequencing errors.
- mDefault_messageFont = TQFont(KGlobalSettings::generalFont().family(), 16, TQFont::Bold);
+ mDefault_messageFont = TQFont(TDEGlobalSettings::generalFont().family(), 16, TQFont::Bold);
mInstance = new Preferences;
@@ -252,7 +252,7 @@ void Preferences::read()
{
initialise();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
TQStringList cols = config->readListEntry(MESSAGE_COLOURS);
if (!cols.count())
@@ -358,7 +358,7 @@ void Preferences::read()
*/
void Preferences::save(bool syncToDisc)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(VERSION_NUM, KALARM_VERSION);
TQStringList colours;
@@ -428,12 +428,12 @@ void Preferences::save(bool syncToDisc)
void Preferences::syncToDisc()
{
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
}
void Preferences::updateStartOfDayCheck()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(START_OF_DAY_CHECK, startOfDayCheck());
config->sync();
@@ -549,7 +549,7 @@ bool Preferences::notifying(const TQString& messageID)
*/
void Preferences::convertOldPrefs()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
int version = KAlarm::getVersionNumber(config->readEntry(VERSION_NUM));
if (version >= KAlarm::Version(1,4,22))
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 216c1f478..cfda8fc27 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -563,7 +563,7 @@ void RecurrenceEdit::addException()
if (insert)
{
mExceptionDates.insert(it, date);
- mExceptionDateList->insertItem(KGlobal::locale()->formatDate(date), index);
+ mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(date), index);
}
mExceptionDateList->setCurrentItem(index);
enableExceptionButtons();
@@ -856,7 +856,7 @@ void RecurrenceEdit::set(const KAEvent& event, bool keepDuration)
qHeapSort(mExceptionDates);
mExceptionDateList->clear();
for (DateList::ConstIterator it = mExceptionDates.begin(); it != mExceptionDates.end(); ++it)
- mExceptionDateList->insertItem(KGlobal::locale()->formatDate(*it));
+ mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(*it));
enableExceptionButtons();
// Get repetition within recurrence
@@ -1124,7 +1124,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
// Save the first day of the week, just in case it changes while the dialog is open.
TQWidget* box = new TQWidget(this); // this is to control the TQWhatsThis text display area
TQGridLayout* dgrid = new TQGridLayout(box, 4, 2, 0, KDialog::spacingHint());
- const KCalendarSystem* calendar = KGlobal::locale()->calendar();
+ const KCalendarSystem* calendar = TDEGlobal::locale()->calendar();
for (int i = 0; i < 7; ++i)
{
int day = KAlarm::localeDayInWeek_to_weekDay(i);
@@ -1314,7 +1314,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
mPosButton->setFocusWidget(mWeekCombo);
mDayOfWeekCombo = new ComboBox(false, box);
- const KCalendarSystem* calendar = KGlobal::locale()->calendar();
+ const KCalendarSystem* calendar = TDEGlobal::locale()->calendar();
for (int i = 0; i < 7; ++i)
{
int day = KAlarm::localeDayInWeek_to_weekDay(i);
@@ -1465,7 +1465,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area
hlayout->addWidget(w, 1, TQt::AlignAuto);
TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint());
- const KCalendarSystem* calendar = KGlobal::locale()->calendar();
+ const KCalendarSystem* calendar = TDEGlobal::locale()->calendar();
int year = TQDate::currentDate().year();
for (int i = 0; i < 12; ++i)
{
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index b02e9fc2a..bb89711a3 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -413,7 +413,7 @@ bool SoundDlg::checkFile()
{
// It's a relative path.
// Find the first sound resource that contains files.
- TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound");
+ TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs("sound");
if (!soundDirs.isEmpty())
{
TQDir dir;
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 3a3d17606..00f31893b 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -279,7 +279,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
if (defaultDir.isEmpty())
{
if (kdeSoundDir.isNull())
- kdeSoundDir = KGlobal::dirs()->findResourceDir("sound", "KDE_Notify.wav");
+ kdeSoundDir = TDEGlobal::dirs()->findResourceDir("sound", "KDE_Notify.wav");
defaultDir = kdeSoundDir;
}
#ifdef WITHOUT_ARTS
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 62c93f6ea..58e8232ce 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -253,7 +253,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
bool space = false;
if (Preferences::showTooltipAlarmTime())
{
- item.text += KGlobal::locale()->formatTime(item.dateTime.time());
+ item.text += TDEGlobal::locale()->formatTime(item.dateTime.time());
item.text += ' ';
space = true;
}