From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/kjobviewer/kjobviewer.cpp | 26 +++++++++++++------------- kdeprint/kjobviewer/kjobviewer.h | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kdeprint/kjobviewer') diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index 12a7aef1a..6039da9a0 100644 --- a/kdeprint/kjobviewer/kjobviewer.cpp +++ b/kdeprint/kjobviewer/kjobviewer.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -39,22 +39,22 @@ class JobTray : public KSystemTray { public: JobTray(KJobViewerApp *parent, const char *name = 0) - : KSystemTray(0, name), m_app(parent) { connect( this, SIGNAL( quitSelected() ), kapp, SLOT( quit() ) ); } + : KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); } protected: - void mousePressEvent(QMouseEvent*); + void mousePressEvent(TQMouseEvent*); private: KJobViewerApp *m_app; }; -void JobTray::mousePressEvent(QMouseEvent *e) +void JobTray::mousePressEvent(TQMouseEvent *e) { if (e->button() == Qt::RightButton) KSystemTray::mousePressEvent(e); else if (m_app->m_views.count() > 0) { KPopupMenu menu; - QDictIterator it(m_app->m_views); - QPtrList list; + TQDictIterator it(m_app->m_views); + TQPtrList list; list.setAutoDelete(false); for (; it.current(); ++it) { @@ -117,7 +117,7 @@ void KJobViewerApp::initialize() if (!m_timer) { m_timer = KMTimer::self(); - connect(m_timer,SIGNAL(timeout()),SLOT(slotTimer())); + connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); } if (prname.isEmpty() && all) @@ -146,10 +146,10 @@ void KJobViewerApp::initialize() { kdDebug() << "creating new view: " << prname << endl; view = new KMJobViewer(); - connect(view, SIGNAL(jobsShown(KMJobViewer*,bool)), SLOT(slotJobsShown(KMJobViewer*,bool))); - connect(view, SIGNAL(printerChanged(KMJobViewer*,const QString&)), SLOT(slotPrinterChanged(KMJobViewer*,const QString&))); - connect(view, SIGNAL(refreshClicked()), SLOT(slotTimer())); - connect(view, SIGNAL(viewerDestroyed(KMJobViewer*)), SLOT(slotViewerDestroyed(KMJobViewer*))); + connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool))); + connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&))); + connect(view, TQT_SIGNAL(refreshClicked()), TQT_SLOT(slotTimer())); + connect(view, TQT_SIGNAL(viewerDestroyed(KMJobViewer*)), TQT_SLOT(slotViewerDestroyed(KMJobViewer*))); m_views.insert(prname, view); } @@ -193,12 +193,12 @@ void KJobViewerApp::slotTimer() // Refresh views. The first time, job list is reloaded, // other views will simply use reloaded job list bool trigger(true); - QDictIterator it(m_views); + TQDictIterator it(m_views); for (; it.current(); ++it, trigger=false) it.current()->refresh(trigger); } -void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const QString& prname) +void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const TQString& prname) { KMJobViewer *other = m_views.find(prname); if (other) diff --git a/kdeprint/kjobviewer/kjobviewer.h b/kdeprint/kjobviewer/kjobviewer.h index 389f160a4..022194d1a 100644 --- a/kdeprint/kjobviewer/kjobviewer.h +++ b/kdeprint/kjobviewer/kjobviewer.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KMJobViewer; class KMTimer; @@ -45,11 +45,11 @@ protected: protected slots: void slotJobsShown(KMJobViewer*, bool); void slotTimer(); - void slotPrinterChanged(KMJobViewer*, const QString&); + void slotPrinterChanged(KMJobViewer*, const TQString&); void slotViewerDestroyed(KMJobViewer*); private: - QDict m_views; + TQDict m_views; JobTray *m_tray; KMTimer *m_timer; }; -- cgit v1.2.1