summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/kcontrol/touchpad/index.docbook4
-rw-r--r--kcontrol/input/CMakeLists.txt6
-rw-r--r--kcontrol/input/tdesyndaemon.cpp (renamed from kcontrol/input/syndaemon.cpp)44
-rw-r--r--kcontrol/input/tdesyndaemon.h (renamed from kcontrol/input/syndaemon.h)18
-rw-r--r--kcontrol/input/tdesyndaemon_iface.h (renamed from kcontrol/input/syndaemon_iface.h)12
-rw-r--r--kcontrol/input/touchpad_settings.cpp10
6 files changed, 47 insertions, 47 deletions
diff --git a/doc/kcontrol/touchpad/index.docbook b/doc/kcontrol/touchpad/index.docbook
index 328e8c1fd..800090af3 100644
--- a/doc/kcontrol/touchpad/index.docbook
+++ b/doc/kcontrol/touchpad/index.docbook
@@ -391,7 +391,7 @@ method. On-button scrolling converts the motion of a device into scroll events w
</tgroup>
</informaltable>
-<para>* Synaptics supported using external <guilabel>syndaemon</guilabel> service, automatically started/stopped.</para>
+<para>* Synaptics supported using external <guilabel>tdesyndaemon</guilabel> service, automatically started/stopped.</para>
<para>** Not configurable with the Synaptics driver.</para>
<para>*** Disabling vertical scrolling under the Libinput driver disables scrolling entirely.</para>
@@ -399,4 +399,4 @@ method. On-button scrolling converts the motion of a device into scroll events w
</sect1>
-</article> \ No newline at end of file
+</article>
diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index 81d4a2384..9cf3248d5 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -69,11 +69,11 @@ tde_add_kpart( kcm_input AUTOMOC
)
-##### syndaemon (executable) ####################
+##### tdesyndaemon (executable) ####################
-tde_add_executable( syndaemon AUTOMOC
+tde_add_executable( tdesyndaemon AUTOMOC
SOURCES
- syndaemon.cpp syndaemon_iface.skel
+ tdesyndaemon.cpp tdesyndaemon_iface.skel
touchpad_settings.cpp
LINK tdecore-shared ${XINPUT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kcontrol/input/syndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp
index 53d8346ca..46b6d1c92 100644
--- a/kcontrol/input/syndaemon.cpp
+++ b/kcontrol/input/tdesyndaemon.cpp
@@ -1,6 +1,6 @@
/*******************************************************************************
- syndaemon - daemon for the Synaptics touchpad driver which disables touchpad
- on keyboard input
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+ on keyboard input
Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
Stefan Kombrink <katakombi@web.de>
@@ -38,17 +38,17 @@
// tdecm_touchpad
#include "touchpad_settings.h"
-// SynDaemon
-#include "syndaemon.h"
-#include "syndaemon.moc"
+// TDESynDaemon
+#include "tdesyndaemon.h"
+#include "tdesyndaemon.moc"
-const unsigned int SynDaemon::TIME_OUT = 150;
-const unsigned int SynDaemon::POLL_INTERVAL = 100;
-const unsigned int SynDaemon::KEYMAP_SIZE = 32;
+const unsigned int TDESynDaemon::TIME_OUT = 150;
+const unsigned int TDESynDaemon::POLL_INTERVAL = 100;
+const unsigned int TDESynDaemon::KEYMAP_SIZE = 32;
-unsigned char* SynDaemon::m_keyboard_mask;
+unsigned char* TDESynDaemon::m_keyboard_mask;
-SynDaemon::SynDaemon() : DCOPObject("syndaemon"), TQObject()
+TDESynDaemon::TDESynDaemon() : DCOPObject("tdesyndaemon"), TQObject()
{
m_typing = false;
m_time = new TQTime();
@@ -81,19 +81,19 @@ SynDaemon::SynDaemon() : DCOPObject("syndaemon"), TQObject()
m_poll->start(POLL_INTERVAL);
}
-SynDaemon::~SynDaemon()
+TDESynDaemon::~TDESynDaemon()
{
setTouchpadOn(true);
m_poll->stop();
delete m_keyboard_mask;
}
-void SynDaemon::stop()
+void TDESynDaemon::stop()
{
kapp->quit();
}
-void SynDaemon::poll()
+void TDESynDaemon::poll()
{
// do nothing if the user has explicitly disabled the touchpad in the settings
if (!touchpadEnabled()) return;
@@ -117,7 +117,7 @@ void SynDaemon::poll()
}
}
-bool SynDaemon::touchpadEnabled()
+bool TDESynDaemon::touchpadEnabled()
{
// We can't read from our own TouchpadSettings
// as it contains the currently applied value
@@ -127,7 +127,7 @@ bool SynDaemon::touchpadEnabled()
return cfg.readBoolEntry("Enabled", true);
}
-void SynDaemon::setTouchpadOn(bool on)
+void TDESynDaemon::setTouchpadOn(bool on)
{
m_typing = !on;
if (!d_settings->setTouchpadEnabled(on))
@@ -136,14 +136,14 @@ void SynDaemon::setTouchpadOn(bool on)
}
}
-void SynDaemon::clearBit(unsigned char *ptr, int bit)
+void TDESynDaemon::clearBit(unsigned char *ptr, int bit)
{
int byteNum = bit / 8;
int bitNum = bit % 8;
ptr[byteNum] &= ~(1 << bitNum);
}
-bool SynDaemon::hasKeyboardActivity()
+bool TDESynDaemon::hasKeyboardActivity()
{
static unsigned char oldKeyState[KEYMAP_SIZE];
unsigned char keyState[KEYMAP_SIZE];
@@ -183,8 +183,8 @@ bool SynDaemon::hasKeyboardActivity()
extern "C" TDE_EXPORT int main(int argc, char *argv[])
{
- TDEAboutData aboutData( "syndaemon", I18N_NOOP("Synaptics helper daemon"),
- "0.1", I18N_NOOP("Synaptics helper daemon"), TDEAboutData::License_GPL_V2,
+ TDEAboutData aboutData( "tdesyndaemon", I18N_NOOP("TDE Synaptics helper daemon"),
+ "0.1", I18N_NOOP("TDE Synaptics helper daemon"), TDEAboutData::License_GPL_V2,
"© 2024 Mavridis Philippe" );
aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org");
@@ -194,8 +194,8 @@ extern "C" TDE_EXPORT int main(int argc, char *argv[])
TDEApplication app;
app.disableSessionManagement();
- app.dcopClient()->registerAs("syndaemon", false);
+ app.dcopClient()->registerAs("tdesyndaemon", false);
- SynDaemon syndaemon;
+ TDESynDaemon tdesyndaemon;
return app.exec();
-} \ No newline at end of file
+}
diff --git a/kcontrol/input/syndaemon.h b/kcontrol/input/tdesyndaemon.h
index 0556345eb..47b799284 100644
--- a/kcontrol/input/syndaemon.h
+++ b/kcontrol/input/tdesyndaemon.h
@@ -1,6 +1,6 @@
/*******************************************************************************
- syndaemon - daemon for the Synaptics touchpad driver which disables touchpad
- on keyboard input
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+ on keyboard input
Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
Stefan Kombrink <katakombi@web.de>
@@ -20,8 +20,8 @@
*******************************************************************************/
-#ifndef __SYNDAEMON_H__
-#define __SYNDAEMON_H__
+#ifndef __TDESYNDAEMON_H__
+#define __TDESYNDAEMON_H__
// TQt
#include <tqobject.h>
@@ -35,19 +35,19 @@
#undef Bool /* fix problems in --enable-final mode */
#undef None /* fix problems in --enable-final mode */
-// Syndaemon
-#include "syndaemon_iface.h"
+// TDESynDaemon
+#include "tdesyndaemon_iface.h"
class TQTimer;
-class SynDaemon : public TQObject, public virtual SynDaemonIface
+class TDESynDaemon : public TQObject, public virtual TDESynDaemonIface
{
TQ_OBJECT
public:
- SynDaemon();
- ~SynDaemon();
+ TDESynDaemon();
+ ~TDESynDaemon();
bool touchpadEnabled();
diff --git a/kcontrol/input/syndaemon_iface.h b/kcontrol/input/tdesyndaemon_iface.h
index 0f3d33929..68dc8a387 100644
--- a/kcontrol/input/syndaemon_iface.h
+++ b/kcontrol/input/tdesyndaemon_iface.h
@@ -1,6 +1,6 @@
/*******************************************************************************
- syndaemon - daemon for the Synaptics touchpad driver which disables touchpad
- on keyboard input
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+ on keyboard input
Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
@@ -18,17 +18,17 @@
*******************************************************************************/
-#ifndef __SYNDAEMON_IFACE_H__
-#define __SYNDAEMON_IFACE_H__
+#ifndef __TDESYNDAEMON_IFACE_H__
+#define __TDESYNDAEMON_IFACE_H__
// DCOP
#include <dcopobject.h>
-class SynDaemonIface : virtual public DCOPObject
+class TDESynDaemonIface : virtual public DCOPObject
{
K_DCOP
k_dcop:
virtual void stop() = 0;
};
-#endif \ No newline at end of file
+#endif
diff --git a/kcontrol/input/touchpad_settings.cpp b/kcontrol/input/touchpad_settings.cpp
index 1230efcee..ff15e4c21 100644
--- a/kcontrol/input/touchpad_settings.cpp
+++ b/kcontrol/input/touchpad_settings.cpp
@@ -339,13 +339,13 @@ void TouchpadSettings::apply(bool force)
prop->set();
}
- // start/stop syndaemon
- DCOPRef syndaemon("syndaemon", "syndaemon");
- syndaemon.call("stop()");
+ // start/stop tdesyndaemon
+ DCOPRef tdesyndaemon("tdesyndaemon", "tdesyndaemon");
+ tdesyndaemon.call("stop()");
if (offWhileTyping)
{
- kapp->tdeinitExec("syndaemon");
+ kapp->tdeinitExec("tdesyndaemon");
}
}
@@ -406,4 +406,4 @@ bool TouchpadSettings::foundTouchpad()
bool TouchpadSettings::supportedTouchpad()
{
return m_foundTouchpad && m_touchpad.driver != Touchpad::Driver::None;
-} \ No newline at end of file
+}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 12:51:38 +0000