summaryrefslogtreecommitdiffstats
path: root/tdeprint/cups
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:01 -0600
commitdeac2ca49faed824fe83066080714eb6d653615b (patch)
tree8b5bf97c5acaaf5285985b87fa76dbea0f35e4fa /tdeprint/cups
parent0c9d97065a3d6ceb12d687555a1a33d90db96238 (diff)
downloadtdelibs-deac2ca49faed824fe83066080714eb6d653615b.tar.gz
tdelibs-deac2ca49faed824fe83066080714eb6d653615b.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'tdeprint/cups')
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.h4
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.h4
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp10
-rw-r--r--tdeprint/cups/kmcupsjobmanager.h4
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp8
-rw-r--r--tdeprint/cups/kmcupsmanager.h4
-rw-r--r--tdeprint/cups/kmwfax.cpp2
-rw-r--r--tdeprint/cups/kmwfax.h4
-rw-r--r--tdeprint/cups/kmwippprinter.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.h4
-rw-r--r--tdeprint/cups/kmwippselect.cpp2
-rw-r--r--tdeprint/cups/kmwippselect.h4
-rw-r--r--tdeprint/cups/kmwother.cpp2
-rw-r--r--tdeprint/cups/kmwother.h4
16 files changed, 31 insertions, 31 deletions
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 754c9659e..fbdafbdb9 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -29,7 +29,7 @@
EditList::EditList(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
- list_ = new KListBox(this);
+ list_ = new TDEListBox(this);
addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this);
editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this);
delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this);
diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h
index a0fc7ee0a..19a2da8c8 100644
--- a/tdeprint/cups/cupsdconf2/editlist.h
+++ b/tdeprint/cups/cupsdconf2/editlist.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqpixmap.h>
-class KListBox;
+class TDEListBox;
class TQPushButton;
class EditList : public TQWidget
@@ -53,7 +53,7 @@ protected slots:
void slotSelected(int);
private:
- KListBox *list_;
+ TDEListBox *list_;
TQPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_;
};
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index c2fcaab7b..cec6f383b 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -30,7 +30,7 @@
QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
- m_view = new KListView(this);
+ m_view = new TDEListView(this);
m_view->header()->hide();
m_view->addColumn("");
m_view->setFullWidth(true);
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
index c3765362e..a55f3355e 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-class KListView;
+class TDEListView;
class TQListViewItem;
class TQPushButton;
@@ -46,7 +46,7 @@ private slots:
void slotSelected(TQListViewItem*);
private:
- KListView *m_view;
+ TDEListView *m_view;
TQPushButton *m_add, *m_remove;
};
diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp
index 0b31489cc..b7284d1ad 100644
--- a/tdeprint/cups/kmcupsjobmanager.cpp
+++ b/tdeprint/cups/kmcupsjobmanager.cpp
@@ -352,10 +352,10 @@ bool KMCupsJobManager::jobIppReport(KMJob *j)
return result;
}
-TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *coll)
+TQValueList<TDEAction*> KMCupsJobManager::createPluginActions(TDEActionCollection *coll)
{
- TQValueList<KAction*> list;
- KAction *act(0);
+ TQValueList<TDEAction*> list;
+ TDEAction *act(0);
list << (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp"));
act->setGroup("plugin");
@@ -369,7 +369,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c
return list;
}
-void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPtrList<KMJob>& joblist)
+void KMCupsJobManager::validatePluginActions(TDEActionCollection *coll, const TQPtrList<KMJob>& joblist)
{
TQPtrListIterator<KMJob> it(joblist);
bool flag(true);
@@ -380,7 +380,7 @@ void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPt
/*&& !it.current()->isRemote()*/);
}
flag = (flag && joblist.count() > 0);
- KAction *a;
+ TDEAction *a;
if ( ( a = coll->action( "plugin_ipp" ) ) )
a->setEnabled( joblist.count() == 1 );
if ( ( a = coll->action( "plugin_prioup" ) ) )
diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h
index 7e8a75a53..0635dd8ea 100644
--- a/tdeprint/cups/kmcupsjobmanager.h
+++ b/tdeprint/cups/kmcupsjobmanager.h
@@ -35,8 +35,8 @@ public:
virtual ~KMCupsJobManager();
int actions();
- TQValueList<KAction*> createPluginActions(KActionCollection*);
- void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&);
+ TQValueList<TDEAction*> createPluginActions(TDEActionCollection*);
+ void validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&);
bool doPluginAction(int, const TQPtrList<KMJob>&);
protected:
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 5b99c88d9..fecac0169 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -915,15 +915,15 @@ TQStringList KMCupsManager::detectLocalPrinters()
return list;
}
-void KMCupsManager::createPluginActions(KActionCollection *coll)
+void KMCupsManager::createPluginActions(TDEActionCollection *coll)
{
- KAction *act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
+ TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
act->setGroup("plugin");
- act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
+ act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
act->setGroup("plugin");
}
-void KMCupsManager::validatePluginActions(KActionCollection *coll, KMPrinter *pr)
+void KMCupsManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *pr)
{
// save selected printer for future use in slots
m_currentprinter = pr;
diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h
index d574bb686..1e7c21b19 100644
--- a/tdeprint/cups/kmcupsmanager.h
+++ b/tdeprint/cups/kmcupsmanager.h
@@ -63,8 +63,8 @@ public:
bool configureServer(TQWidget *parent = 0);
TQStringList detectLocalPrinters();
- void createPluginActions(KActionCollection*);
- void validatePluginActions(KActionCollection*, KMPrinter*);
+ void createPluginActions(TDEActionCollection*);
+ void validatePluginActions(TDEActionCollection*, KMPrinter*);
TQString stateInformation();
public slots:
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 51ecbab73..610217da1 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -41,7 +41,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
TQLabel *lab = new TQLabel(this);
lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>"));
- m_list = new KListBox(this);
+ m_list = new TDEListBox(this);
TQVBoxLayout *l1 = new TQVBoxLayout(this,0,10);
l1->addWidget(lab,0);
diff --git a/tdeprint/cups/kmwfax.h b/tdeprint/cups/kmwfax.h
index 1a822165e..50b2aec0c 100644
--- a/tdeprint/cups/kmwfax.h
+++ b/tdeprint/cups/kmwfax.h
@@ -22,7 +22,7 @@
#include "kmwizardpage.h"
-class KListBox;
+class TDEListBox;
class KMWFax : public KMWizardPage
{
@@ -33,7 +33,7 @@ public:
void updatePrinter(KMPrinter*);
private:
- KListBox *m_list;
+ TDEListBox *m_list;
};
#endif
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index 044f9cb6d..1a4cf4d94 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -46,7 +46,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
m_ID = KMWizard::Custom+1;
m_nextpage = KMWizard::Driver;
- m_list = new KListView(this);
+ m_list = new TDEListView(this);
m_list->addColumn("");
m_list->header()->hide();
m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h
index 5d9d33f7a..f578afba9 100644
--- a/tdeprint/cups/kmwippprinter.h
+++ b/tdeprint/cups/kmwippprinter.h
@@ -22,7 +22,7 @@
#include "kmwizardpage.h"
-class KListView;
+class TDEListView;
class TQListViewItem;
class TQLineEdit;
class TQTextView;
@@ -46,7 +46,7 @@ protected slots:
void slotIppReport();
private:
- KListView *m_list;
+ TDEListView *m_list;
NetworkScanner *m_scanner;
TQLineEdit *m_uri;
TQTextView *m_info;
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index a10a14ba5..c889edbf9 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -38,7 +38,7 @@ KMWIppSelect::KMWIppSelect(TQWidget *parent, const char *name)
m_title = i18n("Remote IPP Printer Selection");
m_nextpage = KMWizard::Driver;
- m_list = new KListBox(this);
+ m_list = new TDEListBox(this);
TQVBoxLayout *lay = new TQVBoxLayout(this, 0, 0);
lay->addWidget(m_list);
diff --git a/tdeprint/cups/kmwippselect.h b/tdeprint/cups/kmwippselect.h
index 8d1711e8c..6b8d788e6 100644
--- a/tdeprint/cups/kmwippselect.h
+++ b/tdeprint/cups/kmwippselect.h
@@ -22,7 +22,7 @@
#include "kmwizardpage.h"
-class KListBox;
+class TDEListBox;
class KMWIppSelect : public KMWizardPage
{
@@ -34,7 +34,7 @@ public:
void updatePrinter(KMPrinter*);
private:
- KListBox *m_list;
+ TDEListBox *m_list;
};
#endif
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 596f61990..7e86cbfb6 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -49,7 +49,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name)
"<li>lpd://server/queue</li>"
"<li>parallel:/dev/lp0</li></ul>"));
TQLabel *l2 = new TQLabel(i18n("URI:"), this);
- m_uriview = new KListView( this );
+ m_uriview = new TDEListView( this );
m_uriview->addColumn( "" );
m_uriview->header()->hide();
m_uriview->setSorting( -1 );
diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h
index eba5ac2b1..a650482f4 100644
--- a/tdeprint/cups/kmwother.h
+++ b/tdeprint/cups/kmwother.h
@@ -23,7 +23,7 @@
#include "kmwizardpage.h"
class TQLineEdit;
-class KListView;
+class TDEListView;
class TQListViewItem;
class KMWOther : public KMWizardPage
@@ -40,7 +40,7 @@ protected slots:
private:
TQLineEdit *m_uri;
- KListView *m_uriview;
+ TDEListView *m_uriview;
};
#endif