1 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 5022ab420..b2ff888b4 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -40,17 +40,17 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
   {
     return new KBellConfig(parent, "kcmbell");
   }
 
-  KDE_EXPORT void init_bell()
+  TDE_EXPORT void init_bell()
   {
     XKeyboardState kbd;
     XKeyboardControl kbdc;
 
-    XGetKeyboardControl(kapp->getDisplay(), &kbd);
+    XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
     TDEConfig config("kcmbellrc", true, false);
     config.setGroup("General");
@@ -58,7 +58,7 @@ extern "C"
     kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
     kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch);
     kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration);
-    XChangeKeyboardControl(kapp->getDisplay(),
+    XChangeKeyboardControl(tdeApp->getDisplay(),
                            KBBellPercent | KBBellPitch | KBBellDuration,
                            &kbdc);
   }
@@ -71,7 +71,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 
   int row = 0;
   TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
-  box->setColumnLayout( 0, Qt::Horizontal );
+  box->setColumnLayout( 0, TQt::Horizontal );
   layout->addWidget(box);
   layout->addStretch();
   TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
@@ -84,7 +84,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 				  "more sophisticated system notification, see the "
 				  "\"System Notifications\" control module for the "
 				  "\"Something Special Happened in the Program\" event."));
-  connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool )));
+  connect(m_useBell, TQ_SIGNAL( toggled( bool )), TQ_SLOT( useBell( bool )));
   row++;
   grid->addMultiCellWidget(m_useBell, row, row, 0, 1);
 
@@ -124,13 +124,13 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
   m_testButton = new TQPushButton(i18n("&Test"), box, "test");
   boxLayout->addWidget(m_testButton, 0, AlignRight);
   grid->addLayout( boxLayout, ++row, 1 );
-  connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell()));
+  connect( m_testButton, TQ_SIGNAL(clicked()), TQ_SLOT(ringBell()));
   TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") );
 
   // watch for changes
-  connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+  connect(m_volume, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_pitch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_duration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
   
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
@@ -154,7 +154,7 @@ void KBellConfig::load()
 void KBellConfig::load( bool useDefaults )
 {
   XKeyboardState kbd;
-  XGetKeyboardControl(kapp->getDisplay(), &kbd);
+  XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
   m_volume->setValue(kbd.bell_percent);
   m_pitch->setValue(kbd.bell_pitch);
@@ -179,7 +179,7 @@ void KBellConfig::save()
   kbd.bell_percent = bellVolume;
   kbd.bell_pitch = bellPitch;
   kbd.bell_duration = bellDuration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 
@@ -216,7 +216,7 @@ void KBellConfig::ringBell()
 
   // store the old state
   XKeyboardState old_state;
-  XGetKeyboardControl(kapp->getDisplay(), &old_state);
+  XGetKeyboardControl(tdeApp->getDisplay(), &old_state);
 
   // switch to the test state
   XKeyboardControl kbd;
@@ -226,17 +226,17 @@ void KBellConfig::ringBell()
     kbd.bell_duration = m_duration->value();
   else
     kbd.bell_duration = 0;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
   // ring bell
-  XBell(kapp->getDisplay(),0);
+  XBell(tdeApp->getDisplay(),0);
 
   // restore old state
   kbd.bell_percent = old_state.bell_percent;
   kbd.bell_pitch = old_state.bell_pitch;
   kbd.bell_duration = old_state.bell_duration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 }