diff options
Diffstat (limited to 'kmilo/thinkpad')
-rw-r--r-- | kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui | 40 | ||||
-rw-r--r-- | kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h | 2 | ||||
-rw-r--r-- | kmilo/thinkpad/kcmthinkpad/main.cpp | 14 | ||||
-rw-r--r-- | kmilo/thinkpad/kcmthinkpad/main.h | 3 | ||||
-rw-r--r-- | kmilo/thinkpad/thinkpad.cpp | 4 | ||||
-rw-r--r-- | kmilo/thinkpad/thinkpad.h | 2 |
6 files changed, 33 insertions, 32 deletions
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui index 771b7bf..3a25893 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCMThinkpadGeneral</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCMThinkpadGeneral</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlOff</cstring> </property> @@ -33,7 +33,7 @@ <string>Could not read /dev/nvram. If you have an IBM Thinkpad load the nvram Linux module <em>insmod nvram</em> and create the node <em>mknod /dev/nvram c 10 144</em> then make the device readable <em>chmod 664 /dev/nvram</em> or writable <em>chmod 666 /dev/nvram</em>.<p> nvram must be writable for software volume control required for R30/R31 models and for using a custom volume change step.</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>bgGeneral</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>mCbRun</cstring> </property> @@ -52,7 +52,7 @@ <string>Run Thinkpad Buttons KMilo plugin</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>mCbSoftwareVolume</cstring> </property> @@ -60,15 +60,15 @@ <string>Change volume in software (required by R30/R31)</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout27</cstring> + <cstring>tqlayout27</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel2_5</cstring> </property> @@ -76,7 +76,7 @@ <string>Command for Mail button:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel2_6</cstring> </property> @@ -97,7 +97,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_4</cstring> </property> @@ -118,7 +118,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>volumeStepLabel</cstring> </property> @@ -153,7 +153,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -161,7 +161,7 @@ <string>Command for Home button:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>mSpinboxVolumeStep</cstring> </property> @@ -193,7 +193,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -284,14 +284,14 @@ <includes> <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>changed();</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>slotChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h index 6ccc675..de8615e 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h @@ -22,7 +22,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index b98dc28..ffb9e8b 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" #define CONFIG_FILE "kmilodrc" -KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) - : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { +KCMThinkpadModule::KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&) + : KCModule(KCMThinkpadModuleFactory::instance(), tqparent, name) { KAboutData* about = new KAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("KDE Control Module for IBM Thinkpad " @@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "jr@jriddell.org"); setAboutData( about ); - TQVBoxLayout* layout = new TQVBoxLayout(this); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this); m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this); - layout->addWidget( m_KCMThinkpadGeneral ); - layout->addStretch(); + tqlayout->addWidget( m_KCMThinkpadGeneral ); + tqlayout->addStretch(); load(); @@ -116,7 +116,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "R30/R31 models and to use a custom volume " "change step, set the nvram device to world " "writeable: <em>chmod 666 " - "/dev/nvram</em>").arg(m_nvramFile)); + "/dev/nvram</em>").tqarg(m_nvramFile)); #endif } else { m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration")); @@ -175,7 +175,7 @@ void KCMThinkpadModule::load(bool useDefaults) { m_KCMThinkpadGeneral->mSpinboxVolumeStep->setValue(config.readNumEntry("volumeStep", 14)); m_KCMThinkpadGeneral->commandExec->setURL(config.readEntry("buttonThinkpad", KDE_BINDIR "/konsole")); m_KCMThinkpadGeneral->commandExecHome->setURL(config.readEntry("buttonHome", KDE_BINDIR "/konqueror")); - m_KCMThinkpadGeneral->commandExecSearch->setURL(config.readEntry("buttonSearch", KDE_BINDIR "/kfind")); + m_KCMThinkpadGeneral->commandExecSearch->setURL(config.readEntry("buttonSearch", KDE_BINDIR "/ktqfind")); m_KCMThinkpadGeneral->commandExecMail->setURL(config.readEntry("buttonMail", KDE_BINDIR "/kmail")); m_KCMThinkpadGeneral->commandExecZoom->setURL(config.readEntry("buttonZoom", KDE_BINDIR "/ksnapshot")); m_nvramFile = config.readEntry("nvram", "/dev/nvram"); diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index 1fdedb5..5719185 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -31,9 +31,10 @@ class KCMThinkPadGeneral; class KCMThinkpadModule : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&); + KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&); void save(); void load(); diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 034c6bd..593612d 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -43,7 +43,7 @@ namespace KMilo { -ThinkPadMonitor::ThinkPadMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) { +ThinkPadMonitor::ThinkPadMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) { m_progress = 0; m_volume = 50; //set in retrieveVolume() } @@ -445,7 +445,7 @@ void ThinkPadMonitor::reconfigure(KConfig* config) { m_volumeStep = config->readNumEntry("volumeStep", defaultVolumeStep); m_buttonThinkpad = config->readEntry("buttonThinkpad", "/usr/bin/konsole"); m_buttonHome = config->readEntry("buttonHome", "/usr/bin/konqueror"); - m_buttonSearch = config->readEntry("buttonSearch", "/usr/bin/kfind"); + m_buttonSearch = config->readEntry("buttonSearch", "/usr/bin/ktqfind"); m_buttonMail = config->readEntry("buttonMail", "/usr/bin/kmail"); m_buttonZoom = config->readEntry("buttonZoom", "/usr/bin/ksnapshot"); } diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h index dc843ca..e4cd952 100644 --- a/kmilo/thinkpad/thinkpad.h +++ b/kmilo/thinkpad/thinkpad.h @@ -83,7 +83,7 @@ typedef struct { */ class ThinkPadMonitor : public Monitor { public: - ThinkPadMonitor(TQObject *parent, const char *name, const TQStringList&); + ThinkPadMonitor(TQObject *tqparent, const char *name, const TQStringList&); virtual ~ThinkPadMonitor(); /** |