1 files changed, 11 insertions, 11 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5e506470c..874df3b67 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -92,14 +92,14 @@ static ModifierKey modifierKeys[] = {
 
 
 KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
-  : KUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
+  : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
                                                  overlay(0), wm(0, KWinModule::INFO_DESKTOP)
 {
   _activeWindow = wm.activeWindow();
-  connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId)));
+  connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId)));
 
   artsBellTimer = new TQTimer( this );
-  connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() ));
+  connect( artsBellTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotArtsBellTimeout() ));
 
   features = 0;
   requestedFeatures = 0;
@@ -132,7 +132,7 @@ void KAccessApp::readSettings()
   _artsBellFile = config->readPathEntry("ArtsBellFile");
   _visibleBell = config->readBoolEntry("VisibleBell", false);
   _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false);
-  TQColor def(Qt::red);
+  TQColor def(TQt::red);
   _visibleBellColor = config->readColorEntry("VisibleBellColor", &def);
   _visibleBellPause = config->readNumEntry("VisibleBellPause", 500);
 
@@ -364,7 +364,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
 void VisualBell::paintEvent(TQPaintEvent *event)
 {
   TQWidget::paintEvent(event);
-  TQTimer::singleShot(_pause, this, TQT_SLOT(hide()));
+  TQTimer::singleShot(_pause, this, TQ_SLOT(hide()));
 }
 
 
@@ -574,12 +574,12 @@ void KAccessApp::createDialogContents() {
       lay->setSpacing(KDialog::spacingHint());
 
       TQLabel *label1 = new TQLabel( contents);
-      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
+      TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
       if (pixmap.isNull())
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
 
-      lay->addWidget( label1, 0, Qt::AlignCenter );
+      lay->addWidget( label1, 0, TQt::AlignCenter );
       lay->addSpacing(KDialog::spacingHint());
 
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
@@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() {
       dialog->setMainWidget(topcontents);
       dialog->enableButtonSeparator(false);
 
-      connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked()));
-      connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked()));
-      connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed()));
+      connect (dialog, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(yesClicked()));
+      connect (dialog, TQ_SIGNAL(noClicked()), this, TQ_SLOT(noClicked()));
+      connect (dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(dialogClosed()));
    }
 }
 
@@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event)
               +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
 
         KWin::setState( dialog->winId(), NET::KeepAbove );
-        kapp->updateUserTimestamp();
+        tdeApp->updateUserTimestamp();
         dialog->show();
      }
   }