From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- korganizer/koglobals.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'korganizer/koglobals.cpp') 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; -- cgit v1.2.1