summaryrefslogtreecommitdiffstats
path: root/tdeprint/kjobviewer
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/kjobviewer')
-rw-r--r--tdeprint/kjobviewer/kjobviewer-autostart.desktop2
-rw-r--r--tdeprint/kjobviewer/kjobviewer.cpp22
-rw-r--r--tdeprint/kjobviewer/kjobviewer.h6
-rw-r--r--tdeprint/kjobviewer/main.cpp2
4 files changed, 16 insertions, 16 deletions
diff --git a/tdeprint/kjobviewer/kjobviewer-autostart.desktop b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
index cc7b52114..4188f3eb2 100644
--- a/tdeprint/kjobviewer/kjobviewer-autostart.desktop
+++ b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
@@ -14,4 +14,4 @@ X-TDE-autostart-condition=tdeprintrc:Jobs:KeepWindow:false
X-TDE-autostart-phase=1
X-TDE-StartupNotify=false
Categories=Qt;TDE;Utility;Printing;HardwareSettings;TrayIcon;
-ShowOnlyIn=TDE;
+OnlyShowIn=TDE;
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index cdf1fc225..6e75ef474 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -39,7 +39,7 @@ class JobTray : public KSystemTray
{
public:
JobTray(KJobViewerApp *parent, const char *name = 0)
- : KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); }
+ : KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), tdeApp, TQ_SLOT( quit() ) ); }
protected:
void mousePressEvent(TQMouseEvent*);
private:
@@ -48,7 +48,7 @@ private:
void JobTray::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
KSystemTray::mousePressEvent(e);
else if (m_app->m_views.count() > 0)
{
@@ -89,7 +89,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e)
//-------------------------------------------------------------
-KJobViewerApp::KJobViewerApp() : KUniqueApplication()
+KJobViewerApp::KJobViewerApp() : TDEUniqueApplication()
{
m_views.setAutoDelete(true);
m_tray = 0;
@@ -114,13 +114,13 @@ void KJobViewerApp::initialize()
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bool showIt = args->isSet("show");
bool all = args->isSet("all");
- QString prname = args->getOption("d");
+ TQString prname = args->getOption("d");
KMJobViewer *view(0);
if (!m_timer)
{
m_timer = KMTimer::self();
- connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
+ connect(m_timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer()));
}
if (prname.isEmpty() && all)
@@ -149,10 +149,10 @@ void KJobViewerApp::initialize()
{
kdDebug() << "creating new view: " << TQString(prname) << endl;
view = new 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*)));
+ connect(view, TQ_SIGNAL(jobsShown(KMJobViewer*,bool)), TQ_SLOT(slotJobsShown(KMJobViewer*,bool)));
+ connect(view, TQ_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQ_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
+ connect(view, TQ_SIGNAL(refreshClicked()), TQ_SLOT(slotTimer()));
+ connect(view, TQ_SIGNAL(viewerDestroyed(KMJobViewer*)), TQ_SLOT(slotViewerDestroyed(KMJobViewer*)));
m_views.insert(prname, view);
}
@@ -184,7 +184,7 @@ void KJobViewerApp::slotJobsShown(KMJobViewer *view, bool hasJobs)
}
else {
TDEStartupInfo::appStarted();
- kapp->quit();
+ tdeApp->quit();
}
}
@@ -230,7 +230,7 @@ void KJobViewerApp::slotViewerDestroyed(KMJobViewer *view)
if (view)
m_views.take(view->printer());
if (m_views.count() == 0)
- kapp->quit();
+ tdeApp->quit();
}
#include "kjobviewer.moc"
diff --git a/tdeprint/kjobviewer/kjobviewer.h b/tdeprint/kjobviewer/kjobviewer.h
index 967262de2..611c04ba3 100644
--- a/tdeprint/kjobviewer/kjobviewer.h
+++ b/tdeprint/kjobviewer/kjobviewer.h
@@ -20,7 +20,7 @@
#ifndef KJOBVIEWER_H
#define KJOBVIEWER_H
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdeprint/kpreloadobject.h>
#include <tqdict.h>
@@ -28,9 +28,9 @@ class KMJobViewer;
class KMTimer;
class JobTray;
-class KJobViewerApp : public KUniqueApplication, public KPReloadObject
+class KJobViewerApp : public TDEUniqueApplication, public KPReloadObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class JobTray;
public:
KJobViewerApp();
diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp
index 0445c71a5..48745216b 100644
--- a/tdeprint/kjobviewer/main.cpp
+++ b/tdeprint/kjobviewer/main.cpp
@@ -33,7 +33,7 @@ static TDECmdLineOptions options[] = {
};
-extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
{
TDEAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, 0);
aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be");