diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/koglobals.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/koglobals.cpp')
| -rw-r--r-- | korganizer/koglobals.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 3077e0cdf..3c1c8e4f7 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -72,7 +72,7 @@ KOGlobals::KOGlobals() mOwnInstance = new TDEInstance( "korganizer" ); mOwnInstance->config()->setGroup( "General" ); mOwnInstance->iconLoader()->addAppDir( "tdepim" ); - KGlobal::iconLoader()->addAppDir( "tdepim" ); + TDEGlobal::iconLoader()->addAppDir( "tdepim" ); mAlarmClient = new AlarmClient; } @@ -91,7 +91,7 @@ KOGlobals::~KOGlobals() const KCalendarSystem *KOGlobals::calendarSystem() const { - return KGlobal::locale()->calendar(); + return TDEGlobal::locale()->calendar(); } AlarmClient *KOGlobals::alarmClient() const @@ -106,7 +106,7 @@ void KOGlobals::fitDialogToScreen( TQWidget *wid, bool force ) int w = wid->frameSize().width(); int h = wid->frameSize().height(); - TQRect desk = KGlobalSettings::desktopGeometry( wid ); + TQRect desk = TDEGlobalSettings::desktopGeometry( wid ); if ( w > desk.width() ) { w = desk.width(); resized = true; |