Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

1 files changed, 11 insertions, 11 deletions

diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index b1b94338..37ce7db8 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -457,12 +457,12 @@ KPrView::~KPrView()
     delete m_findReplace;
     m_findReplace = 0L;
     if(sidebar) {
-        KConfig *config=KGlobal::config();
+        KConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         config->writeEntry("Sidebar", sidebar->isVisible());
     }
     if(notebar) {
-        KConfig *config=KGlobal::config();
+        KConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         config->writeEntry("Notebar", notebar->isVisible());
     }
@@ -1506,12 +1506,12 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
     if ( m_canvas && !presStarted ) {
         const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver");
         if (!xdgScreenSaver.isEmpty()) {
-            KProcess proc;
+            TDEProcess proc;
             proc << xdgScreenSaver;
             proc << "suspend";
             proc << TQString::number( topLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
-            proc.start( KProcess::DontCare );
+            proc.start( TDEProcess::DontCare );
         } else {
             TQByteArray data;
             TQByteArray replyData;
@@ -1548,7 +1548,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
         deSelectAllObjects();
         presStarted = true;
         m_autoPresRestart = false;
-        TQRect desk = KGlobalSettings::desktopGeometry(this);
+        TQRect desk = TDEGlobalSettings::desktopGeometry(this);
         kdDebug(33001) << "KPrView::startScreenPres desk=" << desk << endl;
         TQRect pgRect = kPresenterDoc()->pageList().at(0)->getZoomPageRect();
         kdDebug(33001) << "KPrView::startScreenPres pgRect=" << pgRect << endl;
@@ -1630,12 +1630,12 @@ void KPrView::screenStop()
 
         const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver");
         if (!xdgScreenSaver.isEmpty()) {
-            KProcess proc;
+            TDEProcess proc;
             proc << xdgScreenSaver;
             proc << "resume";
             proc << TQString::number( topLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
-            proc.start( KProcess::DontCare );
+            proc.start( TDEProcess::DontCare );
         } else {
             if ( m_screenSaverWasEnabled )
             {
@@ -2231,7 +2231,7 @@ void KPrView::createGUI()
     {
         sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() );
         sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE );
-        KConfig *config=KGlobal::config();
+        KConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         if(!config->readBoolEntry("Sidebar", true)) {
             sidebar->hide();
@@ -2242,7 +2242,7 @@ void KPrView::createGUI()
 
     if ( notebar )
     {
-        KConfig *config=KGlobal::config();
+        KConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         if(!config->readBoolEntry("Notebar", true)) {
             notebar->hide();
@@ -5414,7 +5414,7 @@ void KPrView::pddClosed()
 TQString KPrView::presentationDurationDataFormatChange( int _time )
 {
     TQTime time( 0, 0, 0 );
-    return KGlobal::locale()->formatTime( time.addMSecs( _time ), true, true );
+    return TDEGlobal::locale()->formatTime( time.addMSecs( _time ), true, true );
 }
 
 
@@ -6463,7 +6463,7 @@ void KPrView::documentModified( bool b )
         return;
 
     if ( b )
-        m_sbModifiedLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
+        m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
     else
         m_sbModifiedLabel->setText( "   " );
 }