From cfc42a28c327b96c6a2afee92af3bac1a479eb8a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:49:52 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdetoys@1157650 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- amor/AmorIface.h | 6 ++-- amor/amor.cpp | 96 ++++++++++++++++++++++++++--------------------------- amor/amor.h | 40 +++++++++++----------- amor/amoranim.cpp | 26 +++++++-------- amor/amoranim.h | 40 +++++++++++----------- amor/amorbubble.cpp | 62 +++++++++++++++++----------------- amor/amorbubble.h | 22 ++++++------ amor/amorconfig.h | 4 +-- amor/amordialog.cpp | 74 ++++++++++++++++++++--------------------- amor/amordialog.h | 32 +++++++++--------- amor/amorpm.cpp | 8 ++--- amor/amorpm.h | 14 ++++---- amor/amortips.cpp | 34 +++++++++---------- amor/amortips.h | 12 +++---- amor/amorwidget.cpp | 16 ++++----- amor/amorwidget.h | 20 +++++------ 16 files changed, 253 insertions(+), 253 deletions(-) (limited to 'amor') diff --git a/amor/AmorIface.h b/amor/AmorIface.h index 575d18d..6f8c531 100644 --- a/amor/AmorIface.h +++ b/amor/AmorIface.h @@ -36,9 +36,9 @@ class AmorIface : virtual public DCOPObject public: k_dcop: - virtual void showTip(QString tip) = 0; - virtual void showMessage(QString message ) = 0; - virtual void showMessage(QString message, int msec ) = 0; + virtual void showTip(TQString tip) = 0; + virtual void showMessage(TQString message ) = 0; + virtual void showMessage(TQString message, int msec ) = 0; virtual void screenSaverStopped() = 0; virtual void screenSaverStarted() = 0; diff --git a/amor/amor.cpp b/amor/amor.cpp index 9f98bb3..bd0171b 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -78,7 +78,7 @@ // Constructor // -QueueItem::QueueItem(itemType ty, QString te, int ti) +QueueItem::QueueItem(itemType ty, TQString te, int ti) { // if the time field was not given, calculate one based on the type // and length of the item @@ -120,7 +120,7 @@ QueueItem::QueueItem(itemType ty, QString te, int ti) // AMOR // Constructor // -Amor::Amor() : DCOPObject( "AmorIface" ), QObject() +Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() { mAmor = 0; mBubble = 0; @@ -136,37 +136,37 @@ Amor::Amor() : DCOPObject( "AmorIface" ), QObject() mState = Normal; mWin = new KWinModule; - connect(mWin, SIGNAL(activeWindowChanged(WId)), - this, SLOT(slotWindowActivate(WId))); - connect(mWin, SIGNAL(windowRemoved(WId)), - this, SLOT(slotWindowRemove(WId))); - connect(mWin, SIGNAL(stackingOrderChanged()), - this, SLOT(slotStackingChanged())); - connect(mWin, SIGNAL(windowChanged(WId, const unsigned long *)), - this, SLOT(slotWindowChange(WId, const unsigned long *))); - connect(mWin, SIGNAL(currentDesktopChanged(int)), - this, SLOT(slotDesktopChange(int))); + connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), + this, TQT_SLOT(slotWindowActivate(WId))); + connect(mWin, TQT_SIGNAL(windowRemoved(WId)), + this, TQT_SLOT(slotWindowRemove(WId))); + connect(mWin, TQT_SIGNAL(stackingOrderChanged()), + this, TQT_SLOT(slotStackingChanged())); + connect(mWin, TQT_SIGNAL(windowChanged(WId, const unsigned long *)), + this, TQT_SLOT(slotWindowChange(WId, const unsigned long *))); + connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT(slotDesktopChange(int))); mAmor = new AmorWidget(); - connect(mAmor, SIGNAL(mouseClicked(const QPoint &)), - SLOT(slotMouseClicked(const QPoint &))); - connect(mAmor, SIGNAL(dragged(const QPoint &, bool)), - SLOT(slotWidgetDragged(const QPoint &, bool))); + connect(mAmor, TQT_SIGNAL(mouseClicked(const TQPoint &)), + TQT_SLOT(slotMouseClicked(const TQPoint &))); + connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), + TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); mAmor->resize(mTheme.maximumSize()); - mTimer = new QTimer(this); - connect(mTimer, SIGNAL(timeout()), SLOT(slotTimeout())); + mTimer = new TQTimer(this); + connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - mStackTimer = new QTimer(this); - connect(mStackTimer, SIGNAL(timeout()), SLOT(restack())); + mStackTimer = new TQTimer(this); + connect(mStackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(restack())); - mBubbleTimer = new QTimer(this); - connect(mBubbleTimer, SIGNAL(timeout()), SLOT(slotBubbleTimeout())); + mBubbleTimer = new TQTimer(this); + connect(mBubbleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBubbleTimeout())); time(&mActiveTime); - mCursPos = QCursor::pos(); - mCursorTimer = new QTimer(this); - connect(mCursorTimer, SIGNAL(timeout()), SLOT(slotCursorTimeout())); + mCursPos = TQCursor::pos(); + mCursorTimer = new TQTimer(this); + connect(mCursorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCursorTimeout())); mCursorTimer->start( 500 ); if (mWin->activeWindow()) @@ -234,7 +234,7 @@ void Amor::screenSaverStarted() //--------------------------------------------------------------------------- // -void Amor::showTip( QString tip ) +void Amor::showTip( TQString tip ) { if (mTipsQueue.count() < 5 && !mForceHideAmorWidget) // start dropping tips if the queue is too long mTipsQueue.enqueue(new QueueItem(QueueItem::Tip, tip)); @@ -247,12 +247,12 @@ void Amor::showTip( QString tip ) } -void Amor::showMessage( QString message ) +void Amor::showMessage( TQString message ) { showMessage(message, -1); } -void Amor::showMessage( QString message , int msec ) +void Amor::showMessage( TQString message , int msec ) { // FIXME: What should be done about messages and tips while the screensaver is on? if (mForceHideAmorWidget) return; // do not show messages sent while in the screensaver @@ -311,12 +311,12 @@ bool Amor::readConfig() // Select a random theme if user requested it if (mConfig.mRandomTheme) { - QStringList files; + TQStringList files; // Store relative paths into files to avoid storing absolute pathnames. KGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); int randomTheme = kapp->random() % files.count(); - mConfig.mTheme = (QString)*files.at(randomTheme); + mConfig.mTheme = (TQString)*files.at(randomTheme); } // read selected theme @@ -439,14 +439,14 @@ void Amor::selectAnimation(State state) // if the animation falls outside of the working area, // then relocate it so that is inside the desktop again - QRect desktopArea = mWin->workArea(); + TQRect desktopArea = mWin->workArea(); mInDesktopBottom = false; if (mTargetRect.y() - mCurrAnim->hotspot().y() + mConfig.mOffset < desktopArea.y()) { // relocate the animation at the bottom of the screen - mTargetRect = QRect(desktopArea.x(), + mTargetRect = TQRect(desktopArea.x(), desktopArea.y() + desktopArea.height(), desktopArea.width(), 0); @@ -594,7 +594,7 @@ void Amor::restack() // // The user clicked on our animation. // -void Amor::slotMouseClicked(const QPoint &pos) +void Amor::slotMouseClicked(const TQPoint &pos) { bool restartTimer = mTimer->isActive(); @@ -610,10 +610,10 @@ void Amor::slotMouseClicked(const QPoint &pos) KPopupMenu* helpMnu = help->menu(); mMenu = new KPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed - mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, SLOT(slotConfigure())); + mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); mMenu->insertSeparator(); mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu); - mMenu->insertItem(SmallIcon("exit"), i18n("&Quit"), kapp, SLOT(quit())); + mMenu->insertItem(SmallIcon("exit"), i18n("&Quit"), kapp, TQT_SLOT(quit())); } mMenu->exec(pos); @@ -630,8 +630,8 @@ void Amor::slotMouseClicked(const QPoint &pos) // void Amor::slotCursorTimeout() { - QPoint currPos = QCursor::pos(); - QPoint diff = currPos - mCursPos; + TQPoint currPos = TQCursor::pos(); + TQPoint diff = currPos - mCursPos; time_t now = time(0); if (mForceHideAmorWidget) return; // we're hidden, do nothing @@ -710,9 +710,9 @@ void Amor::slotConfigure() if (!mAmorDialog) { mAmorDialog = new AmorDialog(); - connect(mAmorDialog, SIGNAL(changed()), SLOT(slotConfigChanged())); - connect(mAmorDialog, SIGNAL(offsetChanged(int)), - SLOT(slotOffsetChanged(int))); + connect(mAmorDialog, TQT_SIGNAL(changed()), TQT_SLOT(slotConfigChanged())); + connect(mAmorDialog, TQT_SIGNAL(offsetChanged(int)), + TQT_SLOT(slotOffsetChanged(int))); } mAmorDialog->show(); @@ -748,7 +748,7 @@ void Amor::slotOffsetChanged(int off) // void Amor::slotAbout() { - QString about = i18n("Amor Version %1\n\n").arg(AMOR_VERSION) + + TQString about = i18n("Amor Version %1\n\n").arg(AMOR_VERSION) + i18n("Amusing Misuse Of Resources\n\n") + i18n("Copyright (c) 1999 Martin R. Jones \n\n") + i18n("Original Author: Martin R. Jones \n") + @@ -761,7 +761,7 @@ void Amor::slotAbout() // // Widget dragged // -void Amor::slotWidgetDragged( const QPoint &delta, bool release ) +void Amor::slotWidgetDragged( const TQPoint &delta, bool release ) { if (mCurrAnim->frame()) { @@ -903,14 +903,14 @@ void Amor::slotWindowChange(WId win, const unsigned long * properties) kdDebug(10000) << "Target window moved or resized" << endl; #endif - QRect newTargetRect = KWin::windowInfo(mTargetWin).frameGeometry(); + TQRect newTargetRect = KWin::windowInfo(mTargetWin).frameGeometry(); // if the change in the window caused the animation to fall // out of the working area of the desktop, or if the animation // didn't fall in the working area before but it does now, then // refocus on the current window so that the animation is // relocated. - QRect desktopArea = mWin->workArea(); + TQRect desktopArea = mWin->workArea(); bool fitsInWorkArea = !(newTargetRect.y() - mCurrAnim->hotspot().y() + mConfig.mOffset < desktopArea.y()); if ((!fitsInWorkArea && !mInDesktopBottom) || (fitsInWorkArea && mInDesktopBottom)) @@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget() { // the only function of this widget is to catch & forward the // saveYourself() signal from the session manager - connect(kapp, SIGNAL(saveYourself()), SLOT(wm_saveyourself())); + connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(wm_saveyourself())); } void AmorSessionWidget::wm_saveyourself() diff --git a/amor/amor.h b/amor/amor.h index a64486b..18487fa 100644 --- a/amor/amor.h +++ b/amor/amor.h @@ -31,8 +31,8 @@ #include #endif -#include -#include +#include +#include #include "amoranim.h" #include "amortips.h" @@ -52,7 +52,7 @@ public: enum itemType { Talk , Tip }; - QueueItem(itemType ty, QString te, int ti = -1); + QueueItem(itemType ty, TQString te, int ti = -1); itemType type() { return iType; } QString text() { return iText; }; @@ -62,7 +62,7 @@ public: private: itemType iType; - QString iText; + TQString iText; int iTime; }; @@ -70,16 +70,16 @@ private: // // Amor handles window manager input and animation selection and updates. // -class Amor : public QObject, virtual public AmorIface +class Amor : public TQObject, virtual public AmorIface { Q_OBJECT public: Amor(); virtual ~Amor(); - virtual void showTip(QString tip); - virtual void showMessage(QString message); - virtual void showMessage(QString message, int msec); + virtual void showTip(TQString tip); + virtual void showMessage(TQString message); + virtual void showMessage(TQString message, int msec); virtual void screenSaverStopped(); virtual void screenSaverStarted(); @@ -93,14 +93,14 @@ public slots: void slotDesktopChange(int); protected slots: - void slotMouseClicked(const QPoint &pos); + void slotMouseClicked(const TQPoint &pos); void slotTimeout(); void slotCursorTimeout(); void slotConfigure(); void slotConfigChanged(); void slotOffsetChanged(int); void slotAbout(); - void slotWidgetDragged( const QPoint &delta, bool release ); + void slotWidgetDragged( const TQPoint &delta, bool release ); void restack(); void hideBubble(bool forceDequeue = false); @@ -110,17 +110,17 @@ protected: enum State { Focus, Blur, Normal, Sleeping, Waking, Destroy }; bool readConfig(); - void readGroupConfig(KConfigBase &config, QPtrList &animList, + void readGroupConfig(KConfigBase &config, TQPtrList &animList, const char *seq); void showBubble(); - AmorAnim *randomAnimation(QPtrList &animList); + AmorAnim *randomAnimation(TQPtrList &animList); void selectAnimation(State state=Normal); void active(); private: KWinModule *mWin; WId mTargetWin; // The window that the animations sits on - QRect mTargetRect; // The goemetry of the target window + TQRect mTargetRect; // The goemetry of the target window WId mNextTarget; // The window that will become the target AmorWidget *mAmor; // The widget displaying the animation AmorThemeManager mTheme; // Animations used by current theme @@ -128,15 +128,15 @@ private: AmorAnim *mCurrAnim; // The currently running animation int mPosition; // The position of the animation State mState; // The current state of the animation - QTimer *mTimer; // Frame timer - QTimer *mCursorTimer;// Cursor timer - QTimer *mStackTimer; // Restacking timer - QTimer *mBubbleTimer;// Bubble tip timer (GP: I didn't create this one, it had no use when I found it) + TQTimer *mTimer; // Frame timer + TQTimer *mCursorTimer;// Cursor timer + TQTimer *mStackTimer; // Restacking timer + TQTimer *mBubbleTimer;// Bubble tip timer (GP: I didn't create this one, it had no use when I found it) AmorDialog *mAmorDialog; // Setup dialog KPopupMenu *mMenu; // Our menu time_t mActiveTime; // The time an active event occurred - QPoint mCursPos; // The last recorded position of the pointer - QString mTipText; // Text to display in a bubble when possible + TQPoint mCursPos; // The last recorded position of the pointer + TQString mTipText; // Text to display in a bubble when possible AmorBubble *mBubble; // Text bubble AmorTips mTips; // Tips to display in the bubble bool mInDesktopBottom; // the animation is not on top of the @@ -145,7 +145,7 @@ private: AmorConfig mConfig; // Configuration parameters bool mForceHideAmorWidget; - QPtrQueue mTipsQueue; // GP: tips queue + TQPtrQueue mTipsQueue; // GP: tips queue }; //--------------------------------------------------------------------------- diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp index 61447f1..b4e595b 100644 --- a/amor/amoranim.cpp +++ b/amor/amoranim.cpp @@ -54,9 +54,9 @@ AmorAnim::~AmorAnim() // // Get the Pixmap for the current frame. // -const QPixmap *AmorAnim::frame() +const TQPixmap *AmorAnim::frame() { - const QPixmap *pixmap = 0; + const TQPixmap *pixmap = 0; if (validFrame()) pixmap = AmorPixmapManager::manager()->pixmap(*mSequence.at(mCurrent)); @@ -75,18 +75,18 @@ void AmorAnim::readConfig(KConfigBase &config) // manager. mSequence = config.readListEntry("Sequence"); int frames = mSequence.count(); - for ( QStringList::Iterator it = mSequence.begin(); + for ( TQStringList::Iterator it = mSequence.begin(); it != mSequence.end(); ++it ) { - const QPixmap *pixmap = + const TQPixmap *pixmap = AmorPixmapManager::manager()->load(*it); if (pixmap) mMaximumSize = mMaximumSize.expandedTo(pixmap->size()); } // Read the delays between frames. - QStrList list; + TQStrList list; int entries = config.readListEntry("Delay",list); mDelay.resize(frames); for (int i = 0; i < entries && i < frames; i++) @@ -113,10 +113,10 @@ void AmorAnim::readConfig(KConfigBase &config) mHotspot[i].setY(atoi(list.at(i))); // Add the overlap of the last frame to the total movement. - const QPoint &lastHotspot = mHotspot[mHotspot.size()-1]; + const TQPoint &lastHotspot = mHotspot[mHotspot.size()-1]; if (mTotalMovement > 0) { - const QPixmap *lastFrame = + const TQPixmap *lastFrame = AmorPixmapManager::manager()->pixmap(mSequence.last()); if (lastFrame) { @@ -147,7 +147,7 @@ AmorThemeManager::~AmorThemeManager() //--------------------------------------------------------------------------- // -bool AmorThemeManager::setTheme(const QString & file) +bool AmorThemeManager::setTheme(const TQString & file) { mPath = locate("appdata", file); @@ -158,7 +158,7 @@ bool AmorThemeManager::setTheme(const QString & file) // Get the directory where the pixmaps are stored and tell the // pixmap manager. - QString pixmapPath = mConfig->readPathEntry("PixmapPath"); + TQString pixmapPath = mConfig->readPathEntry("PixmapPath"); if (pixmapPath.isEmpty()) return false; @@ -188,9 +188,9 @@ bool AmorThemeManager::setTheme(const QString & file) // // Select an animimation randomly from a group // -AmorAnim *AmorThemeManager::random(const QString & group) +AmorAnim *AmorThemeManager::random(const TQString & group) { - QString grp( group ); + TQString grp( group ); if (mStatic) grp = "Base"; @@ -209,7 +209,7 @@ AmorAnim *AmorThemeManager::random(const QString & group) // // Read an animation group. // -bool AmorThemeManager::readGroup(const QString & seq) +bool AmorThemeManager::readGroup(const TQString & seq) { AmorPixmapManager::manager()->setPixmapDir(mPath); @@ -218,7 +218,7 @@ bool AmorThemeManager::readGroup(const QString & seq) // Read the list of available animations. mConfig->setGroup("Config"); - QStrList list; + TQStrList list; int entries = mConfig->readListEntry(seq, list); // Read each individual animation diff --git a/amor/amoranim.h b/amor/amoranim.h index 75341a1..acc4fba 100644 --- a/amor/amoranim.h +++ b/amor/amoranim.h @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -59,32 +59,32 @@ public: { return (mCurrent < mSequence.count()); } int totalMovement() const { return mTotalMovement; } - QSize maximumSize() const + TQSize maximumSize() const { return mMaximumSize; } int delay() const { return (validFrame() ? mDelay[mCurrent] : 100); } - QPoint hotspot() const - { return (validFrame() ? mHotspot[mCurrent] : QPoint(16,16)); } + TQPoint hotspot() const + { return (validFrame() ? mHotspot[mCurrent] : TQPoint(16,16)); } int movement() const { return (validFrame() ? mMovement[mCurrent] : 0); } - const QPixmap *frame(); + const TQPixmap *frame(); protected: void readConfig(KConfigBase &config); protected: unsigned int mCurrent; // current frame in sequence - QStringList mSequence; // sequence of images to display - QMemArray mDelay; // delay between frames - QMemArray mHotspot; // the hotspot in a frame - QMemArray mMovement; // the distance to move between frames + TQStringList mSequence; // sequence of images to display + TQMemArray mDelay; // delay between frames + TQMemArray mHotspot; // the hotspot in a frame + TQMemArray mMovement; // the distance to move between frames int mTotalMovement; // the total distance this animation moves - QSize mMaximumSize; // the maximum size of any frame + TQSize mMaximumSize; // the maximum size of any frame }; //--------------------------------------------------------------------------- -typedef QPtrList AmorAnimationGroup; +typedef TQPtrList AmorAnimationGroup; //--------------------------------------------------------------------------- // @@ -96,20 +96,20 @@ public: AmorThemeManager(); virtual ~AmorThemeManager(); - bool setTheme(const QString & file); - bool readGroup(const QString & seq); + bool setTheme(const TQString & file); + bool readGroup(const TQString & seq); bool isStatic() const { return mStatic; } - AmorAnim *random(const QString & group); + AmorAnim *random(const TQString & group); - QSize maximumSize() const { return mMaximumSize; } + TQSize maximumSize() const { return mMaximumSize; } protected: - QString mPath; + TQString mPath; KSimpleConfig *mConfig; - QSize mMaximumSize; // The largest pixmap used - QDict mAnimations; // list of animation groups + TQSize mMaximumSize; // The largest pixmap used + TQDict mAnimations; // list of animation groups bool mStatic; // static image }; diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index a0c9f6b..8dcc4d3 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -26,13 +26,13 @@ */ #include "amorbubble.h" #include "amorbubble.moc" -#include +#include #include -#include +#include #include #include #include -#include +#include #define ARROW_WIDTH 10 #define ARROW_HEIGHT 12 @@ -45,28 +45,28 @@ // Constructor // AmorBubble::AmorBubble() - : QWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) + : TQWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { mOriginX = 0; mOriginY = 0; mBrowser = new KTextBrowser( this ); - mBrowser->setFrameStyle( QFrame::NoFrame | QFrame::Plain ); + mBrowser->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); mBrowser->setMargin( 0 ); - mBrowser->setWrapPolicy(QTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line? + mBrowser->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line? - QColorGroup clgrp = mBrowser->colorGroup(); - clgrp.setColor(QColorGroup::Text, Qt::black); - //Laurent QTextBrowser didn't have this function FIX me + TQColorGroup clgrp = mBrowser->colorGroup(); + clgrp.setColor(TQColorGroup::Text, Qt::black); + //Laurent TQTextBrowser didn't have this function FIX me //mBrowser->setPaperColorGroup( clgrp ); - mBrowser->setPaper( QToolTip::palette().active().brush( QColorGroup::Background ) ); - mBrowser->setVScrollBarMode( QTextBrowser::AlwaysOff ); - mBrowser->setHScrollBarMode( QTextBrowser::AlwaysOff ); + mBrowser->setPaper( TQToolTip::palette().active().brush( TQColorGroup::Background ) ); + mBrowser->setVScrollBarMode( TQTextBrowser::AlwaysOff ); + mBrowser->setHScrollBarMode( TQTextBrowser::AlwaysOff ); mBrowser->viewport()->installEventFilter( this ); mBrowser->mimeSourceFactory()->addFilePath(KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); - QStringList icons = KGlobal::dirs()->resourceDirs("icon"); - QStringList::Iterator it; + TQStringList icons = KGlobal::dirs()->resourceDirs("icon"); + TQStringList::Iterator it; for (it = icons.begin(); it != icons.end(); ++it) mBrowser->mimeSourceFactory()->addFilePath(*it); @@ -86,9 +86,9 @@ AmorBubble::~AmorBubble() // Set the message to display in the bubble. Causes the geometry of the // widget to be recalculated. // -void AmorBubble::setMessage(const QString& message) +void AmorBubble::setMessage(const TQString& message) { - mMessage = QString( "%1" ).arg( message ); + mMessage = TQString( "%1" ).arg( message ); // hacks because heightForWidth() doesn't work. setGeometry( -1000, 0, 300, 1000 ); show(); @@ -103,7 +103,7 @@ void AmorBubble::setMessage(const QString& message) // void AmorBubble::calcGeometry() { - mBound = QRect( 0, 0, 250, 0 ); + mBound = TQRect( 0, 0, 250, 0 ); // mBound.setHeight( mBrowser->heightForWidth( mBound.width() ) ); mBound.setHeight( mBrowser->contentsHeight() ); mBound.moveBy(ARROW_WIDTH+BORDER_SIZE, BORDER_SIZE); @@ -144,7 +144,7 @@ void AmorBubble::calcGeometry() // create and apply the shape mask mMask.resize(w, h); mMask.fill(color0); - QPainter maskPainter(&mMask); + TQPainter maskPainter(&mMask); maskPainter.setPen(color1); maskPainter.setBrush(color1); drawBubble(maskPainter); @@ -157,9 +157,9 @@ void AmorBubble::calcGeometry() // Draw the bubble that text will be draw into using the current pen // as the outline and the current brush as the fill. // -void AmorBubble::drawBubble(QPainter &p) +void AmorBubble::drawBubble(TQPainter &p) { - QPointArray pointArray(3); + TQPointArray pointArray(3); int left = ARROW_WIDTH; @@ -190,7 +190,7 @@ void AmorBubble::drawBubble(QPainter &p) // p.drawRoundRect(left, 0, width() - ARROW_WIDTH, height(), 10, 20); p.drawRect(left, 0, width() - ARROW_WIDTH, height()); - QPen pen(p.pen()); + TQPen pen(p.pen()); p.setPen(NoPen); p.drawPolygon(pointArray); @@ -202,11 +202,11 @@ void AmorBubble::drawBubble(QPainter &p) // // Draw the message in a bubble // -void AmorBubble::paintEvent(QPaintEvent *) +void AmorBubble::paintEvent(TQPaintEvent *) { - QPainter painter(this); + TQPainter painter(this); painter.setPen(black); - painter.setBrush( QToolTip::palette().active().brush( QColorGroup::Background ) ); + painter.setBrush( TQToolTip::palette().active().brush( TQColorGroup::Background ) ); drawBubble(painter); } @@ -214,32 +214,32 @@ void AmorBubble::paintEvent(QPaintEvent *) // // The user clicked on the widget // -void AmorBubble::mouseReleaseEvent(QMouseEvent *) +void AmorBubble::mouseReleaseEvent(TQMouseEvent *) { hide(); } //--------------------------------------------------------------------------- // -bool AmorBubble::eventFilter( QObject *, QEvent *e ) +bool AmorBubble::eventFilter( TQObject *, TQEvent *e ) { switch ( e->type() ) { -// GP case QEvent::Enter: +// GP case TQEvent::Enter: // GP mBubbleTimer->stop(); // GP break; -// GP case QEvent::Leave: +// GP case TQEvent::Leave: // GP if ( isVisible() ) // GP mBubbleTimer->start( 1000, true ); // GP break; - case QEvent::Enter: + case TQEvent::Enter: mMouseWithin = true; break; - case QEvent::Leave: + case TQEvent::Leave: mMouseWithin = false; break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: hide(); // GP This is the only reason a bubble might posibly be created but hidden break; default: diff --git a/amor/amorbubble.h b/amor/amorbubble.h index 722ec91..50f15b3 100644 --- a/amor/amorbubble.h +++ b/amor/amorbubble.h @@ -32,8 +32,8 @@ #endif #include -#include -#include +#include +#include class QTextBrowser; class QTimer; @@ -50,7 +50,7 @@ public: virtual ~AmorBubble(); void setOrigin(int x, int y) { mOriginX = x; mOriginY = y; } - void setMessage(const QString& message); + void setMessage(const TQString& message); bool mouseWithin() { return mMouseWithin; } @@ -59,20 +59,20 @@ protected: enum HorzPos { Left, Right }; void calcGeometry(); - void drawBubble(QPainter &p); - virtual void paintEvent(QPaintEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual bool eventFilter( QObject *, QEvent * ); + void drawBubble(TQPainter &p); + virtual void paintEvent(TQPaintEvent *); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual bool eventFilter( TQObject *, TQEvent * ); protected: - QString mMessage; // message to display + TQString mMessage; // message to display int mOriginX; // X origin of bubble arrow int mOriginY; // Y origin of bubble arrow - QRect mBound; // bounds of the text - QBitmap mMask; // shape mask + TQRect mBound; // bounds of the text + TQBitmap mMask; // shape mask VertPos mArrowVert; // vertical position of the arrow HorzPos mArrowHorz; // horizontal position of the arrow - QTextBrowser *mBrowser; // displays the message + TQTextBrowser *mBrowser; // displays the message bool mMouseWithin; // the mouse pointer is inside the bubble }; diff --git a/amor/amorconfig.h b/amor/amorconfig.h index 9a93069..218af31 100644 --- a/amor/amorconfig.h +++ b/amor/amorconfig.h @@ -31,7 +31,7 @@ #include #endif -#include +#include //--------------------------------------------------------------------------- // @@ -45,7 +45,7 @@ public: void read(); void write(); - QString mTheme; + TQString mTheme; bool mOnTop; int mOffset; bool mTips; diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index 36f2be3..fb3ddba 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -25,17 +25,17 @@ ** Bug reports and questions can be sent to kde-devel@kde.org */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include "amordialog.h" #include "amordialog.moc" #include "version.h" #include -#include +#include #include //--------------------------------------------------------------------------- @@ -46,22 +46,22 @@ AmorDialog::AmorDialog() : KDialogBase(0, "amordlg", false, i18n("Options"), Ok|Apply|Cancel, Ok ) { mConfig.read(); - QVBox *mainwidget = makeVBoxMainWidget(); + TQVBox *mainwidget = makeVBoxMainWidget(); - QHBox *hb = new QHBox(mainwidget); + TQHBox *hb = new TQHBox(mainwidget); // Theme list - QVBox *themeBox = new QVBox(hb); + TQVBox *themeBox = new TQVBox(hb); themeBox->setSpacing(spacingHint()); - QLabel *label = new QLabel(i18n("Theme:"), themeBox); + TQLabel *label = new TQLabel(i18n("Theme:"), themeBox); - mThemeListBox = new QListBox(themeBox); - connect(mThemeListBox,SIGNAL(highlighted(int)),SLOT(slotHighlighted(int))); + mThemeListBox = new TQListBox(themeBox); + connect(mThemeListBox,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotHighlighted(int))); mThemeListBox->setMinimumSize( fontMetrics().maxWidth()*20, fontMetrics().lineSpacing()*6 ); - mAboutEdit = new QMultiLineEdit(themeBox); + mAboutEdit = new TQMultiLineEdit(themeBox); mAboutEdit->setReadOnly(true); mAboutEdit->setMinimumHeight( fontMetrics().lineSpacing()*4 ); @@ -69,29 +69,29 @@ AmorDialog::AmorDialog() themeBox->setStretchFactor(mAboutEdit, 1); // Animation offset - QVBox *offsetBox = new QVBox(hb); + TQVBox *offsetBox = new TQVBox(hb); offsetBox->setSpacing(spacingHint()); - label = new QLabel(i18n("Offset:"), offsetBox); + label = new TQLabel(i18n("Offset:"), offsetBox); - QSlider *slider = new QSlider(-40, 40, 5, mConfig.mOffset, - QSlider::Vertical, offsetBox); - connect(slider, SIGNAL(valueChanged(int)), SLOT(slotOffset(int))); + TQSlider *slider = new TQSlider(-40, 40, 5, mConfig.mOffset, + TQSlider::Vertical, offsetBox); + connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotOffset(int))); // Always on top - QCheckBox *checkBox = new QCheckBox(i18n("Always on top"), mainwidget); - connect(checkBox, SIGNAL(toggled(bool)), SLOT(slotOnTop(bool))); + TQCheckBox *checkBox = new TQCheckBox(i18n("Always on top"), mainwidget); + connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOnTop(bool))); checkBox->setChecked(mConfig.mOnTop); - checkBox = new QCheckBox(i18n("Show random tips"), mainwidget); - connect(checkBox, SIGNAL(toggled(bool)), SLOT(slotRandomTips(bool))); + checkBox = new TQCheckBox(i18n("Show random tips"), mainwidget); + connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTips(bool))); checkBox->setChecked(mConfig.mTips); // always keep this one after the connect, or the QList would not be grayed when it should - checkBox = new QCheckBox(i18n("Use a random character"), mainwidget); - connect(checkBox, SIGNAL(toggled(bool)), SLOT(slotRandomTheme(bool))); + checkBox = new TQCheckBox(i18n("Use a random character"), mainwidget); + connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTheme(bool))); checkBox->setChecked(mConfig.mRandomTheme); - checkBox = new QCheckBox(i18n("Allow application tips"), mainwidget); - connect(checkBox, SIGNAL(toggled(bool)), SLOT(slotApplicationTips(bool))); + checkBox = new TQCheckBox(i18n("Allow application tips"), mainwidget); + connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotApplicationTips(bool))); checkBox->setChecked(mConfig.mAppTips); readThemes(); @@ -111,13 +111,13 @@ AmorDialog::~AmorDialog() // void AmorDialog::readThemes() { - QStringList files; + TQStringList files; // Non-recursive search for theme files, with the relative paths stored // in files so that absolute paths are not used. KGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files); - for (QStringList::ConstIterator it = files.begin(); + for (TQStringList::ConstIterator it = files.begin(); it != files.end(); it++) addTheme(*it); @@ -127,13 +127,13 @@ void AmorDialog::readThemes() // // Add a single theme to the list // -void AmorDialog::addTheme(const QString& file) +void AmorDialog::addTheme(const TQString& file) { KSimpleConfig config(locate("appdata", file), true); config.setGroup("Config"); - QString pixmapPath = config.readPathEntry("PixmapPath"); + TQString pixmapPath = config.readPathEntry("PixmapPath"); if (pixmapPath.isEmpty()) { return; @@ -147,13 +147,13 @@ void AmorDialog::addTheme(const QString& file) pixmapPath = locate("appdata", pixmapPath); } - QString description = config.readEntry("Description"); - QString about = config.readEntry("About", " "); - QString pixmapName = config.readEntry("Icon"); + TQString description = config.readEntry("Description"); + TQString about = config.readEntry("About", " "); + TQString pixmapName = config.readEntry("Icon"); pixmapPath += pixmapName; - QPixmap pixmap(pixmapPath); + TQPixmap pixmap(pixmapPath); AmorListBoxItem *item = new AmorListBoxItem(description, pixmap); mThemeListBox->insertItem(item); @@ -261,10 +261,10 @@ void AmorDialog::slotCancel() // // AmorListBoxItem implements a list box items for selection of themes // -void AmorListBoxItem::paint( QPainter *p ) +void AmorListBoxItem::paint( TQPainter *p ) { p->drawPixmap( 3, 0, mPixmap ); - QFontMetrics fm = p->fontMetrics(); + TQFontMetrics fm = p->fontMetrics(); int yPos; // vertical text position if ( mPixmap.height() < fm.height() ) yPos = fm.ascent() + fm.leading()/2; @@ -273,12 +273,12 @@ void AmorListBoxItem::paint( QPainter *p ) p->drawText( mPixmap.width() + 5, yPos, text() ); } -int AmorListBoxItem::height(const QListBox *lb ) const +int AmorListBoxItem::height(const TQListBox *lb ) const { return QMAX( mPixmap.height(), lb->fontMetrics().lineSpacing() + 1 ); } -int AmorListBoxItem::width(const QListBox *lb ) const +int AmorListBoxItem::width(const TQListBox *lb ) const { return mPixmap.width() + lb->fontMetrics().width( text() ) + 6; } diff --git a/amor/amordialog.h b/amor/amordialog.h index 59e639d..2f978fd 100644 --- a/amor/amordialog.h +++ b/amor/amordialog.h @@ -27,10 +27,10 @@ #ifndef AMORDIALOG_H #define AMORDIALOG_H -#include -#include -#include -#include +#include +#include +#include +#include #include "amorconfig.h" #include @@ -72,13 +72,13 @@ protected slots: protected: void readThemes(); - void addTheme(const QString& file); + void addTheme(const TQString& file); protected: - QListBox *mThemeListBox; - QMultiLineEdit *mAboutEdit; - QStringList mThemes; - QStringList mThemeAbout; + TQListBox *mThemeListBox; + TQMultiLineEdit *mAboutEdit; + TQStringList mThemes; + TQStringList mThemeAbout; AmorConfig mConfig; }; @@ -89,18 +89,18 @@ protected: class AmorListBoxItem : public QListBoxItem { public: - AmorListBoxItem(const QString & s, const QPixmap& p) - : QListBoxItem(), mPixmap(p) + AmorListBoxItem(const TQString & s, const TQPixmap& p) + : TQListBoxItem(), mPixmap(p) { setText(s); } protected: - virtual void paint(QPainter *); - virtual int height(const QListBox *) const; - virtual int width(const QListBox *) const; - virtual const QPixmap *pixmap() const { return &mPixmap; } + virtual void paint(TQPainter *); + virtual int height(const TQListBox *) const; + virtual int width(const TQListBox *) const; + virtual const TQPixmap *pixmap() const { return &mPixmap; } private: - QPixmap mPixmap; + TQPixmap mPixmap; }; #endif // AMORDIALOG_H diff --git a/amor/amorpm.cpp b/amor/amorpm.cpp index 2a34495..75a87b3 100644 --- a/amor/amorpm.cpp +++ b/amor/amorpm.cpp @@ -54,15 +54,15 @@ AmorPixmapManager::~AmorPixmapManager() // Returns: // pointer to pixmap if loaded successfully, 0 otherwise. // -const QPixmap *AmorPixmapManager::load(const QString & img) +const TQPixmap *AmorPixmapManager::load(const TQString & img) { - QPixmap *pixmap = mPixmaps.find(img); + TQPixmap *pixmap = mPixmaps.find(img); if (!pixmap) { // pixmap has not yet been loaded. - QString path = mPixmapDir + QString("/") + img; - pixmap = new QPixmap(path); + TQString path = mPixmapDir + TQString("/") + img; + pixmap = new TQPixmap(path); if (!pixmap->isNull()) { diff --git a/amor/amorpm.h b/amor/amorpm.h index f67850b..ad2a355 100644 --- a/amor/amorpm.h +++ b/amor/amorpm.h @@ -31,8 +31,8 @@ #include #endif -#include -#include +#include +#include //--------------------------------------------------------------------------- // @@ -44,19 +44,19 @@ public: AmorPixmapManager(); virtual ~AmorPixmapManager(); - void setPixmapDir(const QString &dir) + void setPixmapDir(const TQString &dir) { mPixmapDir = dir; } void reset() { mPixmapDir = "."; mPixmaps.clear(); } - const QPixmap *load(const QString & img); - const QPixmap *pixmap(const QString & img) const + const TQPixmap *load(const TQString & img); + const TQPixmap *pixmap(const TQString & img) const { return mPixmaps.find(img); } static AmorPixmapManager *manager(); public: - QString mPixmapDir; // get pixmaps from here - QDict mPixmaps; // list of pixmaps + TQString mPixmapDir; // get pixmaps from here + TQDict mPixmaps; // list of pixmaps static AmorPixmapManager *mManager; // static pointer to instance }; diff --git a/amor/amortips.cpp b/amor/amortips.cpp index 1ef7c8f..798657e 100644 --- a/amor/amortips.cpp +++ b/amor/amortips.cpp @@ -29,8 +29,8 @@ #include "amortips.h" #include #include -#include -#include +#include +#include #include //--------------------------------------------------------------------------- @@ -45,11 +45,11 @@ AmorTips::AmorTips() // Set the file containing tips. This reads all tips into memory at the // moment - need to make more efficient. // -bool AmorTips::setFile(const QString& file) +bool AmorTips::setFile(const TQString& file) { bool rv = false; - QString path( locate("appdata", file) ); + TQString path( locate("appdata", file) ); if(path.length() && read(path)) rv = true; @@ -71,11 +71,11 @@ void AmorTips::reset() // // Get a tip randomly from the list // -QString AmorTips::tip() +TQString AmorTips::tip() { if (mTips.count()) { - QString tip = *mTips.at(kapp->random() % mTips.count()); + TQString tip = *mTips.at(kapp->random() % mTips.count()); return i18n(tip.utf8()); } @@ -88,24 +88,24 @@ QString AmorTips::tip() // bool AmorTips::readKTips() { - QString fname; + TQString fname; - fname = locate("data", QString("kdewizard/tips")); + fname = locate("data", TQString("kdewizard/tips")); if (fname.isEmpty()) return false; - QFile f(fname); + TQFile f(fname); if (f.open(IO_ReadOnly)) { // Reading of tips must be exactly as in KTipDatabase::loadTips for translation - QString content = f.readAll(); - const QRegExp rx("\\n+"); + TQString content = f.readAll(); + const TQRegExp rx("\\n+"); int pos = -1; while ((pos = content.find("", pos + 1, false)) != -1) { - QString tip = content + TQString tip = content .mid(pos + 6, content.find("", pos, false) - pos - 6) .replace(rx, "\n"); if (!tip.endsWith("\n")) @@ -130,9 +130,9 @@ bool AmorTips::readKTips() // // Read all tips from the specified file. // -bool AmorTips::read(const QString& path) +bool AmorTips::read(const TQString& path) { - QFile file(path); + TQFile file(path); if (file.open(IO_ReadOnly)) { @@ -151,17 +151,17 @@ bool AmorTips::read(const QString& path) // // Read a single tip. // -bool AmorTips::readTip(QFile &file) +bool AmorTips::readTip(TQFile &file) { char buffer[1024] = ""; - QString tip; + TQString tip; while (!file.atEnd() && buffer[0] != '%') { file.readLine(buffer, 1024); if (buffer[0] != '%') { - tip += QString::fromUtf8(buffer); + tip += TQString::fromUtf8(buffer); } } diff --git a/amor/amortips.h b/amor/amortips.h index 7b0ddff..aea323e 100644 --- a/amor/amortips.h +++ b/amor/amortips.h @@ -31,7 +31,7 @@ #include #endif -#include +#include class QFile; //--------------------------------------------------------------------------- @@ -43,17 +43,17 @@ class AmorTips public: AmorTips(); - bool setFile(const QString& file); + bool setFile(const TQString& file); void reset(); - QString tip(); + TQString tip(); protected: bool readKTips(); - bool read(const QString& file); - bool readTip(QFile &file); + bool read(const TQString& file); + bool readTip(TQFile &file); protected: - QStringList mTips; + TQStringList mTips; }; #endif // AMORTIPS_H diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index e343524..c659af2 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -26,7 +26,7 @@ */ #include "amorwidget.h" #include "amorwidget.moc" -#include +#include #include #include @@ -35,7 +35,7 @@ // Constructor // AmorWidget::AmorWidget() - : QWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ), + : TQWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ), mPixmap(0) { setBackgroundMode( NoBackground ); @@ -54,7 +54,7 @@ AmorWidget::~AmorWidget() // // Set the pixmap to display // -void AmorWidget::setPixmap(const QPixmap *pixmap) +void AmorWidget::setPixmap(const TQPixmap *pixmap) { mPixmap = pixmap; @@ -75,7 +75,7 @@ void AmorWidget::setPixmap(const QPixmap *pixmap) // // Draw the pixmap // -void AmorWidget::paintEvent(QPaintEvent *) +void AmorWidget::paintEvent(TQPaintEvent *) { if (mPixmap) bitBlt( this, 0, 0, mPixmap ); @@ -87,7 +87,7 @@ void AmorWidget::paintEvent(QPaintEvent *) // // The user clicked on the widget // -void AmorWidget::mousePressEvent(QMouseEvent *me) +void AmorWidget::mousePressEvent(TQMouseEvent *me) { clickPos = me->globalPos(); } @@ -96,7 +96,7 @@ void AmorWidget::mousePressEvent(QMouseEvent *me) // // The user moved the mouse // -void AmorWidget::mouseMoveEvent(QMouseEvent *me) +void AmorWidget::mouseMoveEvent(TQMouseEvent *me) { if ( me->state() == LeftButton ) { if ( !dragging && (clickPos-me->globalPos()).manhattanLength() > 3 ) @@ -112,14 +112,14 @@ void AmorWidget::mouseMoveEvent(QMouseEvent *me) // // The user clicked on the widget // -void AmorWidget::mouseReleaseEvent(QMouseEvent *me) +void AmorWidget::mouseReleaseEvent(TQMouseEvent *me) { if ( dragging ) emit dragged( me->globalPos() - clickPos, true ); else if ( me->state() == RightButton ) emit mouseClicked(clickPos); - clickPos = QPoint(); + clickPos = TQPoint(); dragging = false; } diff --git a/amor/amorwidget.h b/amor/amorwidget.h index 5aaac82..308ed73 100644 --- a/amor/amorwidget.h +++ b/amor/amorwidget.h @@ -32,7 +32,7 @@ #endif #include -#include +#include //--------------------------------------------------------------------------- // @@ -45,21 +45,21 @@ public: AmorWidget(); virtual ~AmorWidget(); - void setPixmap(const QPixmap *pixmap); + void setPixmap(const TQPixmap *pixmap); signals: - void mouseClicked(const QPoint &pos); - void dragged( const QPoint &delta, bool release ); + void mouseClicked(const TQPoint &pos); + void dragged( const TQPoint &delta, bool release ); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + void paintEvent(TQPaintEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); protected: - const QPixmap *mPixmap; - QPoint clickPos; + const TQPixmap *mPixmap; + TQPoint clickPos; bool dragging; }; -- cgit v1.2.1