summaryrefslogtreecommitdiffstats
path: root/kcontrol/access
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/access')
-rw-r--r--kcontrol/access/kaccess.cpp18
-rw-r--r--kcontrol/access/kaccess.h4
-rw-r--r--kcontrol/access/kcmaccess.cpp116
-rw-r--r--kcontrol/access/main.cpp2
4 files changed, 70 insertions, 70 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 2cb9281df..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;
@@ -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,7 +574,7 @@ 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);
@@ -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();
}
}
diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index fbfa0d783..0bb22f8e7 100644
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -6,7 +6,7 @@
#include <tqcolor.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <twinmodule.h>
@@ -19,7 +19,7 @@ class KDialogBase;
class TQLabel;
class KComboBox;
-class KAccessApp : public KUniqueApplication
+class KAccessApp : public TDEUniqueApplication
{
TQ_OBJECT
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index e38615ebb..b7e20d27b 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcolorbutton.h>
#include <tdefiledialog.h>
#include <tdeapplication.h>
@@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
KIntNumInput::setRange (min,max,step, slider);
if (slider) {
- disconnect(m_slider, TQT_SIGNAL(valueChanged(int)),
- m_spin, TQT_SLOT(setValue(int)));
- disconnect(m_spin, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(spinValueChanged(int)));
+ disconnect(m_slider, TQ_SIGNAL(valueChanged(int)),
+ m_spin, TQ_SLOT(setValue(int)));
+ disconnect(m_spin, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(spinValueChanged(int)));
this->min = min;
this->max = max;
@@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
double logVal = alpha * (log((double)value())-log((double)min));
m_slider->setValue ((int)floor (0.5 + logVal));
- connect(m_slider, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSliderValueChanged(int)));
- connect(m_spin, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSpinValueChanged(int)));
+ connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSliderValueChanged(int)));
+ connect(m_spin, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSpinValueChanged(int)));
}
}
@@ -276,13 +276,13 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
TQWhatsThis::add( soundLabel, wtstr );
TQWhatsThis::add( soundButton, wtstr );
- connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound()));
+ connect(soundButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectSound()));
- connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+ connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
- connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+ connect(systemBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(soundEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
// -----------------------------------------------------
@@ -320,22 +320,22 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addSpacing(24);
durationSlider = new ExtendedIntNumInput(grp);
- durationSlider->setRange(100, 2000, 100);
+ durationSlider->setRange(10, 2000, 10);
durationSlider->setLabel(i18n("Duration:"));
durationSlider->setSuffix(i18n(" msec"));
hbox->addWidget(durationSlider);
TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") );
- connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
- connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor()));
+ connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+ connect(colorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFlashScreenColor()));
- connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked()));
- connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked()));
+ connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertClicked()));
+ connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(flashClicked()));
- connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+ connect(durationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
vbox->addStretch();
@@ -391,16 +391,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyModifiersButton);
- connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+ connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(stickyKeysLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(stickyKeysAutoOff, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
- connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
- connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+ connect(stickyKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(toggleKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+ connect(kNotifyModifiersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
vbox->addStretch();
@@ -424,7 +424,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addSpacing(24);
slowKeysDelay = new ExtendedIntNumInput(grp);
slowKeysDelay->setSuffix(i18n(" msec"));
- slowKeysDelay->setRange(50, 10000, 100);
+ slowKeysDelay->setRange(10, 10000, 10);
slowKeysDelay->setLabel(i18n("Acceptance dela&y:"));
hbox->addWidget(slowKeysDelay);
@@ -456,7 +456,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addSpacing(24);
bounceKeysDelay = new ExtendedIntNumInput(grp);
bounceKeysDelay->setSuffix(i18n(" msec"));
- bounceKeysDelay->setRange(100, 5000, 100);
+ bounceKeysDelay->setRange(10, 5000, 10);
bounceKeysDelay->setLabel(i18n("D&ebounce time:"));
hbox->addWidget(bounceKeysDelay);
@@ -465,18 +465,18 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp);
hbox->addWidget(bounceKeysRejectBeep);
- connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
- connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+ connect(slowKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+ connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
- connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+ connect(slowKeysPressBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(slowKeysAcceptBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(slowKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
- connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
- connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+ connect(bounceKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+ connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(bounceKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
vbox->addStretch();
@@ -513,7 +513,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox->addSpacing(24);
timeoutDelay = new KIntNumInput(grp);
timeoutDelay->setSuffix(i18n(" min"));
- timeoutDelay->setRange(1, 30, 4);
+ timeoutDelay->setRange(1, 30, 1);
timeoutDelay->setLabel(i18n("Timeout:"));
hbox->addWidget(timeoutDelay);
@@ -539,15 +539,15 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyAccessXButton);
- connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
- connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
- connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
- connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+ connect(gestures, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+ connect(timeoutDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+ connect(accessxBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(gestureConfirmation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+ connect(kNotifyAccessXButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
vbox->addStretch();
@@ -717,7 +717,7 @@ void KAccessConfig::save()
// When turning things off, it needs to be done by kaccess,
// so don't actually kill it *shrug*.
if ( true /*needToRunKAccessDaemon( config )*/ )
- kapp->startServiceByDesktopName("kaccess");
+ tdeApp->startServiceByDesktopName("kaccess");
else // don't need it -> kill it
{
@@ -799,7 +799,7 @@ void KAccessConfig::checkAccess()
extern "C"
{
- KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
{
return new KAccessConfig(parent, name);
}
@@ -807,14 +807,14 @@ extern "C"
/* This one gets called by kcminit
*/
- KDE_EXPORT void init_access()
+ TDE_EXPORT void init_access()
{
TDEConfig *config = new TDEConfig("kaccessrc", true, false);
bool run = needToRunKAccessDaemon( config );
delete config;
if (run)
- kapp->startServiceByDesktopName("kaccess");
+ tdeApp->startServiceByDesktopName("kaccess");
}
}
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index aede70579..11aedc50b 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -4,7 +4,7 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
-extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
+extern "C" TDE_EXPORT int kdemain(int argc, char * argv[] )
{
TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, TDEAboutData::License_GPL,
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 09:02:26 +0000