From 5f5ee2367157176ed223b86343eb0a9e4022e020 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:52:55 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1157653 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 30 ++++++++++----------- kmilo/kmilo_kvaio/kcmkvaio/main.h | 4 +-- kmilo/kmilo_kvaio/kmilo_kvaio.cpp | 4 +-- kmilo/kmilo_kvaio/kmilo_kvaio.h | 8 +++--- kmilo/kmilo_kvaio/kvaio.cpp | 42 +++++++++++++++--------------- kmilo/kmilo_kvaio/kvaio.h | 10 +++---- kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 10 +++---- kmilo/kmilo_kvaio/kvaiodriverinterface.h | 6 ++--- 8 files changed, 57 insertions(+), 57 deletions(-) (limited to 'kmilo/kmilo_kvaio') diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index ce27c94..4cf9707 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -19,11 +19,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -40,13 +40,13 @@ #include "main.h" #include "main.moc" -typedef KGenericFactory KVaioModuleFactory; +typedef KGenericFactory KVaioModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) #define CONFIG_FILE "kmilodrc" -KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &) +KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KVaioModuleFactory::instance(), parent, name) { KAboutData *about = @@ -61,14 +61,14 @@ KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &) "mirko@kde.org"); setAboutData( about ); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); mKVaioGeneral = new KCMKVaioGeneral(this); layout->addWidget( mKVaioGeneral ); layout->addStretch(); mDriver = new KVaioDriverInterface(this); mDriverAvailable = mDriver->connectToDriver(false); - mTimer = new QTimer(this); + mTimer = new TQTimer(this); mTimer->start(231); load(); @@ -82,10 +82,10 @@ KVaioModule::KVaioModule(QWidget *parent, const char *name, const QStringList &) // mKVaioGeneral->frameMain->setEnabled (true); } - connect(mKVaioGeneral, SIGNAL(changed()), - SLOT(changed())); - connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); - connect(mDriver, SIGNAL (vaioEvent(int)), SLOT (vaioEvent(int) ) ); + connect(mKVaioGeneral, TQT_SIGNAL(changed()), + TQT_SLOT(changed())); + connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) ); } void KVaioModule::save() @@ -108,8 +108,8 @@ void KVaioModule::save() if(mClient.attach()) { - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (!mClient.call("kded", "kmilod", "reconfigure()", data, replyType, replyData)) diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index c19b648..7d47b74 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -33,7 +33,7 @@ class KVaioModule : public KCModule Q_OBJECT public: - KVaioModule(QWidget *parent, const char *name, const QStringList &); + KVaioModule(TQWidget *parent, const char *name, const TQStringList &); void save(); void load(); @@ -46,7 +46,7 @@ protected slots: private: KCMKVaioGeneral *mKVaioGeneral; KVaioDriverInterface *mDriver; - QTimer *mTimer; + TQTimer *mTimer; bool mDriverAvailable; }; diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index 6389759..1f4a886 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -26,8 +26,8 @@ #include "kvaio.h" #include "kmilointerface.h" -KMiloKVaio::KMiloKVaio(QObject *parent, const char *name, - const QStringList& args) +KMiloKVaio::KMiloKVaio(TQObject *parent, const char *name, + const TQStringList& args) : Monitor(parent, name, args), m_kvaio(0) { diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index fccd7e9..ffcc604 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -37,8 +37,8 @@ class KMiloKVaio : public KMilo::Monitor { // Q_OBJECT public: - KMiloKVaio(QObject *parent, - const char *name, const QStringList&); + KMiloKVaio(TQObject *parent, + const char *name, const TQStringList&); virtual ~KMiloKVaio(); virtual bool init(); @@ -48,11 +48,11 @@ class KMiloKVaio : public KMilo::Monitor { virtual void reconfigure(KConfig*); - bool showTextMsg(const QString& msg) { + bool showTextMsg(const TQString& msg) { _interface->displayText(msg); return true; } - bool showProgressMsg(const QString& msg, int progress) { + bool showProgressMsg(const TQString& msg, int progress) { _interface->displayProgress(msg,progress); return true; } diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 8a02098..167ddcb 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -31,10 +31,10 @@ #include "kvaio.h" #include "kmilointerface.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -56,9 +56,9 @@ extern "C" { KVaio::KVaio(KMiloKVaio *parent, const char* name) - : QObject(parent, name), + : TQObject(parent, name), mDisp(0), - mTimer (new QTimer (this) ) + mTimer (new TQTimer (this) ) { myparent = parent; @@ -70,8 +70,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) kdDebug() << "KVaio: Cannot connect to driver." << endl; } else { kdDebug() << "KVaio: Connected to SonyPI driver." << endl; - connect(mDriver, SIGNAL(vaioEvent(int)), SLOT(slotVaioEvent(int))); - connect (mTimer, SIGNAL (timeout ()), SLOT (slotTimeout() ) ); + connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int))); + connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) ); mTimer->start (10000, true); } @@ -126,8 +126,8 @@ KVaio::~KVaio() void KVaio::slotVaioEvent(int event) { - QString text; - QTextStream stream(text, IO_WriteOnly); + TQString text; + TQTextStream stream(text, IO_WriteOnly); switch(event) { @@ -174,14 +174,14 @@ void KVaio::slotVaioEvent(int event) } } -bool KVaio::showTextMsg(const QString& msg) +bool KVaio::showTextMsg(const TQString& msg) { return myparent->showTextMsg(msg); } -bool KVaio::showProgressMsg(const QString& msg, int value) +bool KVaio::showProgressMsg(const TQString& msg, int value) { m_progress = value; return myparent->showProgressMsg(msg,value); @@ -193,9 +193,9 @@ void KVaio::blankScreen() if (isKScreensaverAvailable()) { - QByteArray data, replyData; - QDataStream arg(data, IO_WriteOnly); - QCString replyType; + TQByteArray data, replyData; + TQDataStream arg(data, IO_WriteOnly); + TQCString replyType; /* Set the screensave to BlankOnly mode */ blankonly = true; @@ -223,9 +223,9 @@ void KVaio::blankScreen() void KVaio::suspendToDisk() { - QByteArray data, replyData; - QDataStream arg(data, IO_WriteOnly); - QCString replyType; + TQByteArray data, replyData; + TQDataStream arg(data, IO_WriteOnly); + TQCString replyType; mClient.call("kpowersave","KPowersaveIface","do_suspendToDisk()", data, replyType, replyData) ; @@ -340,8 +340,8 @@ bool KVaio::showBatteryStatus ( bool force ) bool displayBatteryMsg = false; bool displayACStatus = false; - QString text, acMsg; - QTextStream stream(text, IO_WriteOnly); + TQString text, acMsg; + TQTextStream stream(text, IO_WriteOnly); // ----- // only display on startup if mReportPowerStatus is true: @@ -584,7 +584,7 @@ void KVaio::mute() m_mute = !m_mute; int newVolume; - QString muteText; + TQString muteText; if (m_mute) { m_oldVolume = m_volume; diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index c16f27e..fac0290 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -26,7 +26,7 @@ #include #endif -#include +#include #include #include @@ -57,7 +57,7 @@ class KVaio : public QObject { Q_OBJECT public: -// KVaio(QObject *parent = 0, const char *name =0); +// KVaio(TQObject *parent = 0, const char *name =0); KVaio(KMiloKVaio *parent = 0, const char *name =0); virtual ~KVaio(); @@ -71,8 +71,8 @@ protected: DCOPClient mClient; bool isKScreensaverAvailable(); bool isKMiloDAvailable(); - bool showTextMsg(const QString& msg); - bool showProgressMsg(const QString& msg, int progress); + bool showTextMsg(const TQString& msg); + bool showProgressMsg(const TQString& msg, int progress); bool showBatteryStatus ( bool force = false); protected slots: void slotVaioEvent(int); @@ -107,7 +107,7 @@ private: bool mReportUnknownEvents; bool mReportPowerStatus; bool mShowPowerStatusOnBackButton; - QTimer *mTimer; + TQTimer *mTimer; }; #endif // _KVAIO_H diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 32da70a..20a7a72 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -37,7 +37,7 @@ extern "C" { #include "./sonypi.h" } -#include +#include #include // Taken from Stelian Pop's spicctrl utility: @@ -64,8 +64,8 @@ extern "C" { #define SONYPI_IOCGBLUE _IOR('v', 8, __u8) #define SONYPI_IOCSBLUE _IOW('v', 9, __u8) -KVaioDriverInterface::KVaioDriverInterface(QObject *parent) - : QObject(parent), +KVaioDriverInterface::KVaioDriverInterface(TQObject *parent) + : TQObject(parent), mFd(0), mNotifier(0) { @@ -90,8 +90,8 @@ bool KVaioDriverInterface::connectToDriver(bool listen) if(listen) { - mNotifier = new QSocketNotifier(mFd, QSocketNotifier::Read, this); - connect(mNotifier, SIGNAL(activated(int)), SLOT(socketActivated(int))); + mNotifier = new TQSocketNotifier(mFd, TQSocketNotifier::Read, this); + connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int))); } return true; } diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 55c32b6..9259248 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -18,7 +18,7 @@ #ifndef KVAIO_DRIVERINTERFACE_H #define KVAIO_DRIVERINTERFACE_H -#include +#include class QTimer; @@ -35,7 +35,7 @@ class KVaioDriverInterface : public QObject { Q_OBJECT public: - KVaioDriverInterface(QObject *parent=0); + KVaioDriverInterface(TQObject *parent=0); bool connectToDriver(bool listen = true); void disconnectFromDriver(); /** Return the current display brightness, a value between 0 and @@ -51,7 +51,7 @@ public slots: protected: int mFd; fd_set mRfds; - QSocketNotifier *mNotifier; + TQSocketNotifier *mNotifier; signals: void vaioEvent(int); // void brightnessChanged(int); -- cgit v1.2.1