Use tdeAppHEADmaster

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 84 insertions, 84 deletions

diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp
index 02a9622..3bed726 100644
--- a/src/komposeglobal.cpp
+++ b/src/komposeglobal.cpp
@@ -121,7 +121,7 @@ void KomposeGlobal::initGui()
   KomposeTaskManager::instance();
 
   // Create DCop Client
-  kapp->dcopClient()->setDefaultObject( "KomposeTaskMgrDcopIface" );
+  tdeApp->dcopClient()->setDefaultObject( "KomposeTaskMgrDcopIface" );
 
   initActions();
 
@@ -129,7 +129,7 @@ void KomposeGlobal::initGui()
   {
     // Create systray
     systray = new KomposeSysTray();
-    kapp->setMainWidget( systray );
+    tdeApp->setMainWidget( systray );
     systray->currentDesktopChanged( currentDesktop );
 
     actionCollection->setWidget( systray );
@@ -154,7 +154,7 @@ void KomposeGlobal::initActions()
   actionCollection = new TDEActionCollection( (TQWidget*)0 );
 
   // Actions
-  actQuit = KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection );
+  actQuit = KStdAction::quit( tdeApp, TQ_SLOT(quit()), actionCollection );
   actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
                                  0,
                                  KomposeViewManager::instance(), TQ_SLOT(createWorldView()),
@@ -184,7 +184,7 @@ void KomposeGlobal::initSharedPixmaps()
   // Whenever the background pixmap changes we'll have to reload it:
   //connect(twin_module, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int)));
   connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotDesktopChanged(int)));
-  connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+  connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
 
   enablePixmapExports();
   // When Kompose is started by session management the bg shared pixmap may not be available yet
@@ -254,7 +254,7 @@ void KomposeGlobal::enablePixmapExports()
 {
 #ifdef TQ_WS_X11
   kdDebug() << "KomposeGlobal::enablePixmapExports()" << endl;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isAttached())
     client->attach();
   TQByteArray data;
diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp
index 5a844dd..0b8f9cc 100644
--- a/src/komposesettings.cpp
+++ b/src/komposesettings.cpp
@@ -87,57 +87,57 @@ void KomposeSettings::readConfig()
   globalAccel->readSettings();
   globalAccel->updateConnections();
 
-  kapp->config()->setGroup("Main window");
+  tdeApp->config()->setGroup("Main window");
 
-  defaultView = kapp->config()->readNumEntry("defaultView", KOMPOSEDISPLAY_VIRTUALDESKS);
+  defaultView = tdeApp->config()->readNumEntry("defaultView", KOMPOSEDISPLAY_VIRTUALDESKS);
 
-  useComposite = kapp->config()->readBoolEntry("useComposite", false);
+  useComposite = tdeApp->config()->readBoolEntry("useComposite", false);
 
-  passiveScreenshots = kapp->config()->readBoolEntry("passiveScreenshots", true);
-  screenshotGrabDelay = kapp->config()->readNumEntry("screenshotGrabDelay", 400000000);
+  passiveScreenshots = tdeApp->config()->readBoolEntry("passiveScreenshots", true);
+  screenshotGrabDelay = tdeApp->config()->readNumEntry("screenshotGrabDelay", 400000000);
 
-  // dynamicVirtDeskLayout = kapp->config()->readBoolEntry("dynamicVirtDeskLayout", true);
+  // dynamicVirtDeskLayout = tdeApp->config()->readBoolEntry("dynamicVirtDeskLayout", true);
 
-  imageEffects = kapp->config()->readBoolEntry("imageEffects", true);
-  blurBackground = kapp->config()->readBoolEntry("blurBackground", true);
+  imageEffects = tdeApp->config()->readBoolEntry("imageEffects", true);
+  blurBackground = tdeApp->config()->readBoolEntry("blurBackground", true);
 
-  showIcons = kapp->config()->readBoolEntry("showIcons", true);
-  iconSize = kapp->config()->readNumEntry("iconSize", 3);
+  showIcons = tdeApp->config()->readBoolEntry("showIcons", true);
+  iconSize = tdeApp->config()->readNumEntry("iconSize", 3);
 
-  showWindowTitles = kapp->config()->readBoolEntry("showWindowTitles", true );
-  windowTitleFont = kapp->config()->readFontEntry("windowTitleFont", new TQFont( "arial", 11, TQFont::Bold ) );
-  windowTitleFontColor = kapp->config()->readColorEntry("windowTitleFontColor", new TQColor(TQt::black) );
-  showWindowTitleShadow = kapp->config()->readBoolEntry("showWindowTitleShadow", true );
-  windowTitleFontShadowColor = kapp->config()->readColorEntry("windowTitleFontShadowColor", new TQColor(TQt::lightGray) );
+  showWindowTitles = tdeApp->config()->readBoolEntry("showWindowTitles", true );
+  windowTitleFont = tdeApp->config()->readFontEntry("windowTitleFont", new TQFont( "arial", 11, TQFont::Bold ) );
+  windowTitleFontColor = tdeApp->config()->readColorEntry("windowTitleFontColor", new TQColor(TQt::black) );
+  showWindowTitleShadow = tdeApp->config()->readBoolEntry("showWindowTitleShadow", true );
+  windowTitleFontShadowColor = tdeApp->config()->readColorEntry("windowTitleFontShadowColor", new TQColor(TQt::lightGray) );
 
-  windowBorderActiveColor = kapp->config()->readColorEntry("windowBorderActiveColor", new TQColor(TQt::gray) );
-  windowBorderInactiveColor = kapp->config()->readColorEntry("windowBorderInactiveColor", new TQColor(TQt::black) );
-  windowBorderActiveWidth = kapp->config()->readNumEntry("windowBorderActiveWidth", 2 );
-  windowBorderInactiveWidth = kapp->config()->readNumEntry("windowBorderInactiveWidth", 1 );
-  windowBorderActiveStyle = kapp->config()->readNumEntry("windowBorderActiveStyle", 3 ); // dotted
-  windowBorderInactiveStyle = kapp->config()->readNumEntry("windowBorderInactiveStyle", 1 ); // solid
+  windowBorderActiveColor = tdeApp->config()->readColorEntry("windowBorderActiveColor", new TQColor(TQt::gray) );
+  windowBorderInactiveColor = tdeApp->config()->readColorEntry("windowBorderInactiveColor", new TQColor(TQt::black) );
+  windowBorderActiveWidth = tdeApp->config()->readNumEntry("windowBorderActiveWidth", 2 );
+  windowBorderInactiveWidth = tdeApp->config()->readNumEntry("windowBorderInactiveWidth", 1 );
+  windowBorderActiveStyle = tdeApp->config()->readNumEntry("windowBorderActiveStyle", 3 ); // dotted
+  windowBorderInactiveStyle = tdeApp->config()->readNumEntry("windowBorderInactiveStyle", 1 ); // solid
 
-  desktopTitleFont = kapp->config()->readFontEntry("desktopTitleFont", new TQFont( "arial", 10 ) );
-  desktopTitleFontColor = kapp->config()->readColorEntry("desktopTitleFontColor", new TQColor(TQt::gray) );
-  desktopTitleFontHighlightColor = kapp->config()->readColorEntry("desktopTitleFontHighlightColor", new TQColor(TQt::black) );
+  desktopTitleFont = tdeApp->config()->readFontEntry("desktopTitleFont", new TQFont( "arial", 10 ) );
+  desktopTitleFontColor = tdeApp->config()->readColorEntry("desktopTitleFontColor", new TQColor(TQt::gray) );
+  desktopTitleFontHighlightColor = tdeApp->config()->readColorEntry("desktopTitleFontHighlightColor", new TQColor(TQt::black) );
 
-  cacheScaledPixmaps = kapp->config()->readBoolEntry("cacheScaledPixmaps", true);
+  cacheScaledPixmaps = tdeApp->config()->readBoolEntry("cacheScaledPixmaps", true);
 
-  activateOnTopLeftCorner = kapp->config()->readBoolEntry("activateOnTopLeftCorner", false );
-  activateOnTopRightCorner = kapp->config()->readBoolEntry("activateOnTopRightCorner", false );
-  activateOnBottomLeftCorner = kapp->config()->readBoolEntry("activateOnBottomLeftCorner", false );
-  activateOnBottomRightCorner = kapp->config()->readBoolEntry("activateOnBottomRightCorner", false );
+  activateOnTopLeftCorner = tdeApp->config()->readBoolEntry("activateOnTopLeftCorner", false );
+  activateOnTopRightCorner = tdeApp->config()->readBoolEntry("activateOnTopRightCorner", false );
+  activateOnBottomLeftCorner = tdeApp->config()->readBoolEntry("activateOnBottomLeftCorner", false );
+  activateOnBottomRightCorner = tdeApp->config()->readBoolEntry("activateOnBottomRightCorner", false );
 
-  activateOnTopEdge = kapp->config()->readBoolEntry("activateOnTopEdge", false );
-  activateOnBottomEdge = kapp->config()->readBoolEntry("activateOnBottomEdge", false );
-  activateOnLeftEdge = kapp->config()->readBoolEntry("activateOnLeftEdge", false );
-  activateOnRightEdge = kapp->config()->readBoolEntry("activateOnRightEdge", false );
+  activateOnTopEdge = tdeApp->config()->readBoolEntry("activateOnTopEdge", false );
+  activateOnBottomEdge = tdeApp->config()->readBoolEntry("activateOnBottomEdge", false );
+  activateOnLeftEdge = tdeApp->config()->readBoolEntry("activateOnLeftEdge", false );
+  activateOnRightEdge = tdeApp->config()->readBoolEntry("activateOnRightEdge", false );
 
-  autoLockDelay = kapp->config()->readNumEntry("autoLockDelay", 1000);
+  autoLockDelay = tdeApp->config()->readNumEntry("autoLockDelay", 1000);
 
-  showDesktopNum = kapp->config()->readBoolEntry("showDesktopNum", false );
+  showDesktopNum = tdeApp->config()->readBoolEntry("showDesktopNum", false );
 
-  viewScreen = kapp->config()->readNumEntry("viewScreen", -1);
+  viewScreen = tdeApp->config()->readNumEntry("viewScreen", -1);
 
   calcFontMetrics();
   emit settingsChanged();
@@ -151,58 +151,58 @@ void KomposeSettings::writeConfig()
   globalAccel->updateConnections();
 
   // Read from config file
-  kapp->config()->setGroup("Main window");
+  tdeApp->config()->setGroup("Main window");
 
-  kapp->config()->writeEntry("defaultView", defaultView );
+  tdeApp->config()->writeEntry("defaultView", defaultView );
 
-  kapp->config()->writeEntry("useComposite", useComposite );
+  tdeApp->config()->writeEntry("useComposite", useComposite );
 
-  kapp->config()->writeEntry("passiveScreenshots", passiveScreenshots );
-  kapp->config()->writeEntry("screenshotGrabDelay", screenshotGrabDelay);
+  tdeApp->config()->writeEntry("passiveScreenshots", passiveScreenshots );
+  tdeApp->config()->writeEntry("screenshotGrabDelay", screenshotGrabDelay);
 
-  // kapp->config()->writeEntry("dynamicVirtDeskLayout", dynamicVirtDeskLayout);
+  // tdeApp->config()->writeEntry("dynamicVirtDeskLayout", dynamicVirtDeskLayout);
 
-  kapp->config()->writeEntry("imageEffects", imageEffects);
-  kapp->config()->writeEntry("blurBackground", blurBackground);
+  tdeApp->config()->writeEntry("imageEffects", imageEffects);
+  tdeApp->config()->writeEntry("blurBackground", blurBackground);
 
-  kapp->config()->writeEntry("showIcons", showIcons);
-  kapp->config()->writeEntry("iconSize", iconSize);
+  tdeApp->config()->writeEntry("showIcons", showIcons);
+  tdeApp->config()->writeEntry("iconSize", iconSize);
 
-  kapp->config()->writeEntry("showWindowTitles", showWindowTitles);
-  kapp->config()->writeEntry("windowTitleFont", windowTitleFont);
-  kapp->config()->writeEntry("windowTitleFontColor", windowTitleFontColor);
-  kapp->config()->writeEntry("showWindowTitleShadow", showWindowTitleShadow);
-  kapp->config()->writeEntry("windowTitleFontShadowColor", windowTitleFontShadowColor);
+  tdeApp->config()->writeEntry("showWindowTitles", showWindowTitles);
+  tdeApp->config()->writeEntry("windowTitleFont", windowTitleFont);
+  tdeApp->config()->writeEntry("windowTitleFontColor", windowTitleFontColor);
+  tdeApp->config()->writeEntry("showWindowTitleShadow", showWindowTitleShadow);
+  tdeApp->config()->writeEntry("windowTitleFontShadowColor", windowTitleFontShadowColor);
 
-  kapp->config()->writeEntry("windowBorderActiveColor", windowBorderActiveColor);
-  kapp->config()->writeEntry("windowBorderInactiveColor", windowBorderInactiveColor );
-  kapp->config()->writeEntry("windowBorderActiveWidth", windowBorderActiveWidth );
-  kapp->config()->writeEntry("windowBorderInactiveWidth", windowBorderInactiveWidth );
-  kapp->config()->writeEntry("windowBorderActiveStyle", windowBorderActiveStyle );
-  kapp->config()->writeEntry("windowBorderInactiveStyle", windowBorderInactiveStyle );
+  tdeApp->config()->writeEntry("windowBorderActiveColor", windowBorderActiveColor);
+  tdeApp->config()->writeEntry("windowBorderInactiveColor", windowBorderInactiveColor );
+  tdeApp->config()->writeEntry("windowBorderActiveWidth", windowBorderActiveWidth );
+  tdeApp->config()->writeEntry("windowBorderInactiveWidth", windowBorderInactiveWidth );
+  tdeApp->config()->writeEntry("windowBorderActiveStyle", windowBorderActiveStyle );
+  tdeApp->config()->writeEntry("windowBorderInactiveStyle", windowBorderInactiveStyle );
 
-  kapp->config()->writeEntry("desktopTitleFont", desktopTitleFont);
-  kapp->config()->writeEntry("desktopTitleFontColor", desktopTitleFontColor);
-  kapp->config()->writeEntry("desktopTitleFontHighlightColor", desktopTitleFontHighlightColor);
+  tdeApp->config()->writeEntry("desktopTitleFont", desktopTitleFont);
+  tdeApp->config()->writeEntry("desktopTitleFontColor", desktopTitleFontColor);
+  tdeApp->config()->writeEntry("desktopTitleFontHighlightColor", desktopTitleFontHighlightColor);
 
-  kapp->config()->writeEntry("cacheScaledPixmaps", cacheScaledPixmaps);
+  tdeApp->config()->writeEntry("cacheScaledPixmaps", cacheScaledPixmaps);
 
-  kapp->config()->writeEntry("activateOnTopLeftCorner", activateOnTopLeftCorner);
-  kapp->config()->writeEntry("activateOnTopRightCorner", activateOnTopRightCorner);
-  kapp->config()->writeEntry("activateOnBottomLeftCorner", activateOnBottomLeftCorner);
-  kapp->config()->writeEntry("activateOnBottomRightCorner", activateOnBottomRightCorner);
+  tdeApp->config()->writeEntry("activateOnTopLeftCorner", activateOnTopLeftCorner);
+  tdeApp->config()->writeEntry("activateOnTopRightCorner", activateOnTopRightCorner);
+  tdeApp->config()->writeEntry("activateOnBottomLeftCorner", activateOnBottomLeftCorner);
+  tdeApp->config()->writeEntry("activateOnBottomRightCorner", activateOnBottomRightCorner);
 
-  kapp->config()->writeEntry("activateOnTopEdge", activateOnTopEdge);
-  kapp->config()->writeEntry("activateOnBottomEdge", activateOnBottomEdge);
-  kapp->config()->writeEntry("activateOnLeftEdge", activateOnLeftEdge);
-  kapp->config()->writeEntry("activateOnRightEdge", activateOnRightEdge);
-  kapp->config()->writeEntry("autoLockDelay", autoLockDelay);
+  tdeApp->config()->writeEntry("activateOnTopEdge", activateOnTopEdge);
+  tdeApp->config()->writeEntry("activateOnBottomEdge", activateOnBottomEdge);
+  tdeApp->config()->writeEntry("activateOnLeftEdge", activateOnLeftEdge);
+  tdeApp->config()->writeEntry("activateOnRightEdge", activateOnRightEdge);
+  tdeApp->config()->writeEntry("autoLockDelay", autoLockDelay);
 
-  kapp->config()->writeEntry("showDesktopNum", showDesktopNum);
+  tdeApp->config()->writeEntry("showDesktopNum", showDesktopNum);
 
-  kapp->config()->writeEntry("viewScreen", viewScreen);
+  tdeApp->config()->writeEntry("viewScreen", viewScreen);
 
-  kapp->config()->sync();
+  tdeApp->config()->sync();
 
   kdDebug() << "KomposeSettings::writeConfig() - Settings saved to cfg file" << endl;
 
diff --git a/src/komposetask.cpp b/src/komposetask.cpp
index 554a3f8..2c75062 100644
--- a/src/komposetask.cpp
+++ b/src/komposetask.cpp
@@ -297,7 +297,7 @@ void KomposeTask::refresh()
 
 /**
  * This has to be called by x11EventFilter whenever ConfigureNotify for this win occurs
- * sorta hacky but x11EventFilter can only be implemented in a kapp object which redirects it 
+ * sorta hacky but x11EventFilter can only be implemented in a tdeApp object which redirects it 
  * to the taskmanager, that picks out the right task by winId and notifies us :(
  */
 void KomposeTask::slotX11ConfigureNotify()
@@ -307,7 +307,7 @@ void KomposeTask::slotX11ConfigureNotify()
 
 /**
  * This has to be called by x11EventFilter whenever DamageNotify for this win occurs
- * sorta hacky but x11EventFilter can only be implemented in a kapp object which redirects it 
+ * sorta hacky but x11EventFilter can only be implemented in a tdeApp object which redirects it 
  * to the taskmanager, that picks out the right task by winId and notifies us :(
  */
 void KomposeTask::slotX11DamageNotify()
diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp
index 4830e1d..e5082fc 100644
--- a/src/komposetaskmanager.cpp
+++ b/src/komposetaskmanager.cpp
@@ -318,7 +318,7 @@ TQString KomposeTaskManager::getDesktopName(int desk) const
 
 
 /**
- * The kapp x11EventFilter method redirect to this method
+ * The tdeApp x11EventFilter method redirect to this method
  * @param event 
  * @return 
  */
diff --git a/src/komposetaskwidget.cpp b/src/komposetaskwidget.cpp
index 1dd2557..8f7d6de 100644
--- a/src/komposetaskwidget.cpp
+++ b/src/komposetaskwidget.cpp
@@ -401,9 +401,9 @@ void KomposeTaskWidget::setActionIcons( bool inverse )
 {
 kdDebug() << "setIconSet" << endl;
   if ( ( task->isIconified() && !inverse ) || ( !task->isIconified() && inverse ) )
-    actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "go-up", TDEIcon::NoGroup, 16 ) );
+    actMinimizeRestoreTask->setIconSet( tdeApp->iconLoader()->loadIconSet ( "go-up", TDEIcon::NoGroup, 16 ) );
   else
-    actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "go-bottom", TDEIcon::NoGroup, 16 ) );
+    actMinimizeRestoreTask->setIconSet( tdeApp->iconLoader()->loadIconSet ( "go-bottom", TDEIcon::NoGroup, 16 ) );
 }
 
 void KomposeTaskWidget::slotMinimizeRestoreToggled()
diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp
index 0be6f5a..3883ffd 100644
--- a/src/komposeviewmanager.cpp
+++ b/src/komposeviewmanager.cpp
@@ -224,7 +224,7 @@ void KomposeViewManager::closeCurrentView()
   emit viewClosed();
 
   if ( KomposeGlobal::instance()->getSingleShot() )
-    kapp->quit();
+    tdeApp->quit();
 
   // Reset old Desktop
   KWin::setCurrentDesktop( deskBeforeSnaps );