summaryrefslogtreecommitdiffstats
path: root/korganizer/korgac
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/korgac
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/korgac')
-rw-r--r--korganizer/korgac/alarmdialog.cpp10
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp4
-rw-r--r--korganizer/korgac/korgacmain.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 9f711d609..8cac3182e 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -112,7 +112,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
connect( calendar, TQT_SIGNAL(calendarChanged()),
this, TQT_SLOT(slotCalendarChanged()) );
- KGlobal::iconLoader()->addAppDir( "tdepim" );
+ TDEGlobal::iconLoader()->addAppDir( "tdepim" );
setButtonOK( i18n( "Suspend" ) );
TQWidget *topBox = plainPage();
@@ -123,7 +123,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
topLayout->addWidget( label );
mSplitter = new TQSplitter( Qt::Vertical, topBox );
- mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
topLayout->addWidget( mSplitter );
mIncidenceListView = new KListView( mSplitter );
@@ -505,9 +505,9 @@ void AlarmDialog::eventNotification()
if (alarm->type() == Alarm::Procedure) {
// FIXME: Add a message box asking whether the procedure should really be executed
kdDebug(5890) << "Starting program: '" << alarm->programFile() << "'" << endl;
- KProcess proc;
+ TDEProcess proc;
proc << TQFile::encodeName(alarm->programFile()).data();
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
else if (alarm->type() == Alarm::Audio) {
beeped = true;
@@ -693,7 +693,7 @@ TQDateTime AlarmDialog::triggerDateForIncidence( Incidence *incidence,
if ( incidence->doesRecur() ) {
result = incidence->recurrence()->getNextDateTime( reminderAt );
- displayStr = KGlobal::locale()->formatDateTime( result );
+ displayStr = TDEGlobal::locale()->formatDateTime( result );
}
if ( incidence->type() == "Event" ) {
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index aaeedd7fe..301f058a8 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -57,7 +57,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
setCaption( mName );
// Set up icons
- KGlobal::iconLoader()->addAppDir( "korgac" );
+ TDEGlobal::iconLoader()->addAppDir( "korgac" );
mPixmapEnabled = loadSizedIcon( "korgac", width() );
mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() );
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 5b3ee4e9a..a2eacaf0d 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -152,9 +152,9 @@ void KOAlarmClient::slotQuit()
void KOAlarmClient::saveLastCheckTime()
{
- KConfigGroup cg( KGlobal::config(), "Alarms");
+ KConfigGroup cg( TDEGlobal::config(), "Alarms");
cg.writeEntry( "CalendarsLastChecked", mLastChecked );
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
}
void KOAlarmClient::quit()
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 8b9012387..afa7fe458 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
MyApp app;
app.disableSessionManagement();
- KGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
return app.exec();
}