From 7346aee26bf190a7e70333c40fab4caca847cd27 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:22:56 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun-plugins/noatunmadness/madness.cpp | 18 +++++++++--------- noatun-plugins/noatunmadness/madness.h | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'noatun-plugins/noatunmadness') diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 0b0d086..7027029 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -30,16 +30,16 @@ Plugin *create_plugin() Madness::Madness() : MonoFFTScope(100), Plugin(), mWm(this) { - connect(&mWm, SIGNAL(currentDesktopChanged(int)), SLOT(update())); - connect(&mWm, SIGNAL(windowAdded(WId)), SLOT(update())); - connect(&mWm, SIGNAL(windowRemoved(WId)), SLOT(update())); - connect(&mWm, SIGNAL(strutChanged()), SLOT(update())); + connect(&mWm, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(strutChanged()), TQT_SLOT(update())); } Madness::~Madness() { - QMap::ConstIterator it(mOriginalPositions.begin()); + TQMap::ConstIterator it(mOriginalPositions.begin()); for (; it != mOriginalPositions.end(); ++it) XMoveWindow(qt_xdisplay(), it.key(), (*it).x(), (*it).y()); @@ -50,11 +50,11 @@ void Madness::update() mWindowList = mWm.windows(); mWorkArea = mWm.workArea(); - QValueList::ConstIterator it(mWindowList.begin()); + TQValueList::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { - QRect area=KWin::info(*it).frameGeometry; + TQRect area=KWin::info(*it).frameGeometry; if (!mOriginalPositions.contains(*it)) mOriginalPositions.insert(*it, area.topLeft()); } @@ -76,7 +76,7 @@ void Madness::scopeEvent(float *d, int size) // cout << "delta: " << delta << endl; - QValueList::ConstIterator it(mWindowList.begin()); + TQValueList::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { @@ -92,7 +92,7 @@ void Madness::scopeEvent(float *d, int size) || (mWm.currentDesktop() != i.desktop)) continue; - QRect area=i.frameGeometry; + TQRect area=i.frameGeometry; float lightness=100000.0/(area.width()*area.height()); int x=area.x(); diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h index b36c468..8076d0a 100644 --- a/noatun-plugins/noatunmadness/madness.h +++ b/noatun-plugins/noatunmadness/madness.h @@ -3,11 +3,11 @@ #include #include -#include -#include +#include +#include #include -class Madness : public QObject, public MonoFFTScope, public Plugin +class Madness : public TQObject, public MonoFFTScope, public Plugin { Q_OBJECT public: @@ -24,9 +24,9 @@ protected: private: KWinModule mWm; - QValueList mWindowList; - QRect mWorkArea; - QMap mOriginalPositions; + TQValueList mWindowList; + TQRect mWorkArea; + TQMap mOriginalPositions; }; #endif -- cgit v1.2.1