summaryrefslogtreecommitdiffstats
path: root/tdeprint/management
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/management
parent0c9d97065a3d6ceb12d687555a1a33d90db96238 (diff)
downloadtdelibs-deac2ca49faed824fe83066080714eb6d653615b.tar.gz
tdelibs-deac2ca49faed824fe83066080714eb6d653615b.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'tdeprint/management')
-rw-r--r--tdeprint/management/cjanuswidget.cpp6
-rw-r--r--tdeprint/management/kiconselectaction.cpp20
-rw-r--r--tdeprint/management/kiconselectaction.h2
-rw-r--r--tdeprint/management/kmconfigfilter.cpp14
-rw-r--r--tdeprint/management/kmconfigfilter.h6
-rw-r--r--tdeprint/management/kmconfigfonts.cpp2
-rw-r--r--tdeprint/management/kmconfigfonts.h4
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kminstancepage.cpp2
-rw-r--r--tdeprint/management/kminstancepage.h4
-rw-r--r--tdeprint/management/kmjobviewer.cpp44
-rw-r--r--tdeprint/management/kmjobviewer.h6
-rw-r--r--tdeprint/management/kmmainview.cpp98
-rw-r--r--tdeprint/management/kmmainview.h20
-rw-r--r--tdeprint/management/kmwbackend.cpp8
-rw-r--r--tdeprint/management/kmwclass.cpp4
-rw-r--r--tdeprint/management/kmwclass.h4
-rw-r--r--tdeprint/management/kmwdriverselect.cpp2
-rw-r--r--tdeprint/management/kmwdriverselect.h4
-rw-r--r--tdeprint/management/kmwlocal.cpp2
-rw-r--r--tdeprint/management/kmwlocal.h4
-rw-r--r--tdeprint/management/kmwsocket.cpp2
-rw-r--r--tdeprint/management/kmwsocket.h4
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp10
-rw-r--r--tdeprint/management/kxmlcommanddlg.h12
-rw-r--r--tdeprint/management/kxmlcommandselector.cpp2
-rw-r--r--tdeprint/management/pluginaction.cpp2
-rw-r--r--tdeprint/management/pluginaction.h2
-rw-r--r--tdeprint/management/smbview.cpp2
-rw-r--r--tdeprint/management/smbview.h2
30 files changed, 149 insertions, 149 deletions
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 92ea782e5..1642fb5c6 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -79,7 +79,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p)
//***********************************************************************************
-class CJanusWidget::CListBox : public KListBox
+class CJanusWidget::CListBox : public TDEListBox
{
public:
CListBox(TQWidget *parent = 0, const char *name = 0);
@@ -92,7 +92,7 @@ protected:
};
CJanusWidget::CListBox::CListBox(TQWidget *parent, const char *name)
-: KListBox(parent,name)
+: TDEListBox(parent,name)
{
verticalScrollBar()->installEventFilter(this);
}
@@ -105,7 +105,7 @@ bool CJanusWidget::CListBox::eventFilter(TQObject *o, TQEvent *e)
{
if (e->type() == TQEvent::Show || e->type() == TQEvent::Hide)
computeWidth();
- return KListBox::eventFilter(o,e);
+ return TDEListBox::eventFilter(o,e);
}
void CJanusWidget::CListBox::computeWidth()
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index 8bf4d5a10..f5df42299 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -37,7 +37,7 @@ public:
};
KIconSelectAction::KIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name)
-: KSelectAction(text, accel, parent, name)
+: TDESelectAction(text, accel, parent, name)
{
d = new KIconSelectActionPrivate;
}
@@ -68,7 +68,7 @@ void KIconSelectAction::createPopupMenu()
void KIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst)
{
- KSelectAction::setItems(lst);
+ TDESelectAction::setItems(lst);
d->m_iconlst = iconlst;
updateIcons();
}
@@ -79,12 +79,12 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
{
createPopupMenu();
- value = KSelectAction::plug(widget, index);
+ value = TDESelectAction::plug(widget, index);
}
- else if (widget->inherits("KToolBar"))
+ else if (widget->inherits("TDEToolBar"))
{
- KToolBar* bar = static_cast<KToolBar*>(widget);
- int id = KAction::getToolButtonID();
+ TDEToolBar* bar = static_cast<TDEToolBar*>(widget);
+ int id = TDEAction::getToolButtonID();
// To have a correct layout in the toolbar, a non
// empty icon has to be used. Use "unknown" by default.
TQString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown");
@@ -104,15 +104,15 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
void KIconSelectAction::updateCurrentItem(int id)
{
TQWidget* w = container(id);
- if (w->inherits("KToolBar"))
- static_cast<KToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]);
+ if (w->inherits("TDEToolBar"))
+ static_cast<TDEToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]);
else
- KSelectAction::updateCurrentItem(id);
+ TDESelectAction::updateCurrentItem(id);
}
void KIconSelectAction::setCurrentItem(int index)
{
- KSelectAction::setCurrentItem(index);
+ TDESelectAction::setCurrentItem(index);
}
#include "kiconselectaction.moc"
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 84bef60d2..917dc742b 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -24,7 +24,7 @@
class KIconSelectActionPrivate;
-class KIconSelectAction : public KSelectAction
+class KIconSelectAction : public TDESelectAction
{
Q_OBJECT
public:
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index bcbe1b0f7..637f06ecc 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -43,10 +43,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this);
- m_list1 = new KListBox(box);
- m_list1->setSelectionMode(KListBox::Extended);
- m_list2 = new KListBox(box);
- m_list2->setSelectionMode(KListBox::Extended);
+ m_list1 = new TDEListBox(box);
+ m_list1->setSelectionMode(TDEListBox::Extended);
+ m_list2 = new TDEListBox(box);
+ m_list2->setSelectionMode(TDEListBox::Extended);
m_add = new TQToolButton( box );
m_add->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" ));
m_remove = new TQToolButton( box );
@@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(TDEConfig *conf)
{
if (!it.current()->isSpecial() && !it.current()->isVirtual())
{
- KListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
+ TDEListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName());
}
}
@@ -116,7 +116,7 @@ void KMConfigFilter::saveConfig(TDEConfig *conf)
conf->writeEntry("LocationRe", m_locationre->text());
}
-void KMConfigFilter::transfer(KListBox *from, KListBox *to)
+void KMConfigFilter::transfer(TDEListBox *from, TDEListBox *to)
{
for (uint i=0; i<from->count();)
{
@@ -143,7 +143,7 @@ void KMConfigFilter::slotRemoveClicked()
void KMConfigFilter::slotSelectionChanged()
{
- const KListBox *lb = static_cast<const KListBox*>(sender());
+ const TDEListBox *lb = static_cast<const TDEListBox*>(sender());
if (!lb)
return;
TQToolButton *pb = (lb == m_list1 ? m_add : m_remove);
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 298c83de2..8338ebd6f 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -22,7 +22,7 @@
#include "kmconfigpage.h"
-class KListBox;
+class TDEListBox;
class TQToolButton;
class TQLineEdit;
@@ -41,10 +41,10 @@ protected slots:
void slotRemoveClicked();
protected:
- void transfer(KListBox *from, KListBox *to);
+ void transfer(TDEListBox *from, TDEListBox *to);
private:
- KListBox *m_list1, *m_list2;
+ TDEListBox *m_list1, *m_list2;
TQToolButton *m_add, *m_remove;
TQLineEdit *m_locationre;
};
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 91861f5ca..cd681db3d 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -47,7 +47,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this);
m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box);
- m_fontpath = new KListView(box2);
+ m_fontpath = new TDEListView(box2);
m_fontpath->addColumn("");
m_fontpath->header()->setStretchEnabled(true, 0);
m_fontpath->header()->hide();
diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h
index dd65d3901..8bd285f38 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -22,7 +22,7 @@
#include "kmconfigpage.h"
-class KListView;
+class TDEListView;
class KURLRequester;
class TQPushButton;
class TQCheckBox;
@@ -46,7 +46,7 @@ protected slots:
private:
TQCheckBox *m_embedfonts;
- KListView *m_fontpath;
+ TDEListView *m_fontpath;
KURLRequester *m_addpath;
TQPushButton *m_up, *m_down, *m_add, *m_remove;
};
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 1b05f8e9c..ee442113a 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -46,8 +46,8 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
m_valid = false;
// build widget
- m_manu = new KListBox(this);
- m_model = new KListBox(this);
+ m_manu = new TDEListBox(this);
+ m_model = new TDEListBox(this);
m_postscript = new TQCheckBox(i18n("&PostScript printer"),this);
m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this);
m_postscript->setCursor(KCursor::handCursor());
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 25c037516..2d73c6ecd 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -41,7 +41,7 @@
KMInstancePage::KMInstancePage(TQWidget *parent, const char *name)
: TQWidget(parent,name)
{
- m_view = new KListBox(this);
+ m_view = new TDEListBox(this);
m_printer = 0;
initActions();
diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h
index 7a3075d73..56b045fe2 100644
--- a/tdeprint/management/kminstancepage.h
+++ b/tdeprint/management/kminstancepage.h
@@ -24,7 +24,7 @@
#include <tqvaluelist.h>
#include <tqwidget.h>
-class KListBox;
+class TDEListBox;
class KMPrinter;
class TQButton;
@@ -50,7 +50,7 @@ protected:
void addButton(const TQString& text, const TQString& pixmap, const char *receiver);
private:
- KListBox *m_view;
+ TDEListBox *m_view;
TQValueList<TQButton*> m_buttons;
KMPrinter *m_printer;
};
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 5e4561c19..0af246f80 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -57,7 +57,7 @@
#undef m_manager
#define m_manager KMFactory::self()->jobManager()
-class KJobListView : public KListView
+class KJobListView : public TDEListView
{
public:
KJobListView( TQWidget *parent = 0, const char *name = 0 );
@@ -67,7 +67,7 @@ protected:
};
KJobListView::KJobListView( TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
{
setAcceptDrops( true );
setDropVisualizer( false );
@@ -78,11 +78,11 @@ bool KJobListView::acceptDrag( TQDropEvent *e ) const
if ( KURLDrag::canDecode( e ) )
return true;
else
- return KListView::acceptDrag( e );
+ return TDEListView::acceptDrag( e );
}
KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
-: KMainWindow(parent,name)
+: TDEMainWindow(parent,name)
{
m_view = 0;
m_pop = 0;
@@ -259,20 +259,20 @@ void KMJobViewer::init()
void KMJobViewer::initActions()
{
// job actions
- KAction *hact = new KAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
- KAction *ract = new KAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
- KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
- KAction *sact = new KAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
- KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
+ TDEAction *hact = new TDEAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
+ TDEAction *ract = new TDEAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
+ TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
+ TDEAction *sact = new TDEAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+ TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
mact->setDelayed(false);
connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu()));
- KToggleAction *tact = new KToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
+ TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
- KToggleAction *uact = new KToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs");
+ TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs");
uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal"));
connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
m_userfield = new TQLineEdit(0);
@@ -298,7 +298,7 @@ void KMJobViewer::initActions()
}
// Filter actions
- KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
+ TDEActionMenu *fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
fact->setDelayed(false);
connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
@@ -307,7 +307,7 @@ void KMJobViewer::initActions()
if (!m_standalone)
{
- KToolBar *toolbar = toolBar();
+ TDEToolBar *toolbar = toolBar();
hact->plug(toolbar);
ract->plug(toolbar);
toolbar->insertSeparator();
@@ -327,7 +327,7 @@ void KMJobViewer::initActions()
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
// refresh action
- new KAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
+ new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
// create status bar
KStatusBar *statusbar = statusBar();
@@ -367,13 +367,13 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe
void KMJobViewer::slotShowMoveMenu()
{
- TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("job_move"))->popupMenu();
+ TQPopupMenu *menu = static_cast<TDEActionMenu*>(actionCollection()->action("job_move"))->popupMenu();
buildPrinterMenu(menu, false, false);
}
void KMJobViewer::slotShowPrinterMenu()
{
- TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu();
+ TQPopupMenu *menu = static_cast<TDEActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu();
buildPrinterMenu(menu, true, true);
}
@@ -583,7 +583,7 @@ void KMJobViewer::loadPluginActions()
if (m_standalone)
{
// standalone window, insert actions into main menubar
- KAction *act = actionCollection()->action("job_restart");
+ TDEAction *act = actionCollection()->action("job_restart");
for (int i=0;i<act->containerCount();i++)
{
if (menuBar()->findItem(act->itemId(i), &menu))
@@ -594,8 +594,8 @@ void KMJobViewer::loadPluginActions()
}
}
- TQValueList<KAction*> acts = m_manager->createPluginActions(actionCollection());
- for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+ TQValueList<TDEAction*> acts = m_manager->createPluginActions(actionCollection());
+ for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
{
// connect the action to this
connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int)));
@@ -611,8 +611,8 @@ void KMJobViewer::loadPluginActions()
void KMJobViewer::removePluginActions()
{
- TQValueList<KAction*> acts = actionCollection()->actions("plugin");
- for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+ TQValueList<TDEAction*> acts = actionCollection()->actions("plugin");
+ for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
{
(*it)->unplugAll();
delete (*it);
@@ -650,7 +650,7 @@ void KMJobViewer::reload()
// update the "History" action state
actionCollection()->action("view_completed")->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
- static_cast<KToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false);
+ static_cast<TDEToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false);
}
void KMJobViewer::closeEvent(TQCloseEvent *e)
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 1dca024a8..534958656 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -30,7 +30,7 @@
class KMJobManager;
class KMJob;
-class KListView;
+class TDEListView;
class JobItem;
class TQPopupMenu;
class TQListViewItem;
@@ -46,7 +46,7 @@ class TQCheckBox;
* if you're a TDEPrint developer. The API might change in the
* future and binary compatibility might be broken.
*/
-class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject
{
Q_OBJECT
public:
@@ -108,7 +108,7 @@ protected:
void updateStatusBar();
private:
- KListView *m_view;
+ TDEListView *m_view;
TQPtrList<KMJob> m_jobs;
TQPtrList<JobItem> m_items;
TQPopupMenu *m_pop;
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 858fca0fc..9673d214f 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -78,7 +78,7 @@ int tdeprint_management_add_printer_wizard( TQWidget* parent )
return flag;
}
-KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *coll)
+KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection *coll)
: TQWidget(parent, name)
{
m_current = 0;
@@ -88,15 +88,15 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
m_printerview = new KMPrinterView(this, "PrinterView");
m_printerpages = new KMPages(this, "PrinterPages");
m_pop = new TQPopupMenu(this);
- m_toolbar = new KToolBar(this, "ToolBar");
+ m_toolbar = new TDEToolBar(this, "ToolBar");
m_toolbar->setMovingEnabled(false);
m_plugin = new PluginComboBox(this, "Plugin");
/*
m_menubar = new KMenuBar( this );
static_cast<KMenuBar*>( m_menubar )->setTopLevelMenu( false );
*/
- m_menubar = new KToolBar( this, "MenuBar", false, false );
- m_menubar->setIconText( KToolBar::IconTextRight );
+ m_menubar = new TDEToolBar( this, "MenuBar", false, false );
+ m_menubar->setIconText( TDEToolBar::IconTextRight );
m_menubar->setMovingEnabled( false );
// layout
@@ -122,7 +122,7 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
if (coll)
m_actions = coll;
else
- m_actions = new KActionCollection(this);
+ m_actions = new TDEActionCollection(this);
initActions();
// first update
@@ -151,13 +151,13 @@ void KMMainView::restoreSettings()
setOrientation(conf->readNumEntry("Orientation", Qt::Vertical));
bool view = conf->readBoolEntry("ViewToolBar",false);
slotToggleToolBar(view);
- ((KToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
+ ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
view = conf->readBoolEntry( "ViewMenuBar", true );
slotToggleMenuBar( view );
- static_cast<KToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view );
+ static_cast<TDEToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view );
view = conf->readBoolEntry("ViewPrinterInfos",true);
slotShowPrinterInfos(view);
- ((KToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view);
+ ((TDEToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view);
}
void KMMainView::saveSettings()
@@ -166,9 +166,9 @@ void KMMainView::saveSettings()
conf->setGroup("General");
conf->writeEntry("ViewType",(int)m_printerview->viewType());
conf->writeEntry("Orientation",(int)orientation());
- conf->writeEntry("ViewToolBar",((KToggleAction*)m_actions->action("view_toolbar"))->isChecked());
- conf->writeEntry("ViewMenuBar",static_cast<KToggleAction*>( m_actions->action("view_menubar") )->isChecked());
- conf->writeEntry("ViewPrinterInfos",((KToggleAction*)m_actions->action("view_printerinfos"))->isChecked());
+ conf->writeEntry("ViewToolBar",((TDEToggleAction*)m_actions->action("view_toolbar"))->isChecked());
+ conf->writeEntry("ViewMenuBar",static_cast<TDEToggleAction*>( m_actions->action("view_menubar") )->isChecked());
+ conf->writeEntry("ViewPrinterInfos",((TDEToggleAction*)m_actions->action("view_printerinfos"))->isChecked());
conf->sync();
}
@@ -181,25 +181,25 @@ void KMMainView::initActions()
vact->setCurrentItem(0);
connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int)));
- KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
+ TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
stateAct->setDelayed(false);
- stateAct->insert(new KAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
- stateAct->insert(new KAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+ stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
+ stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
- stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
+ stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
stateAct->setDelayed(false);
- stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
- stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
-
- new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
- new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
- new KAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
- new KAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
- new KAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
- new KAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
- new KAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
- new KAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
- new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
+ stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
+ stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
+
+ new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
+ new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
+ new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
+ new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
+ new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
+ new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
+ new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
+ new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
+ new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
iconlst.clear();
@@ -208,29 +208,29 @@ void KMMainView::initActions()
dact->setCurrentItem(0);
connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
- new KAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
- new KAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
- new KAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
+ new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
+ new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
+ new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
- KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
+ TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
tact->setCheckedState(i18n("Hide &Toolbar"));
connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool)));
- tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
+ tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) );
- tact = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
+ tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
tact->setChecked(true);
connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool)));
- tact = new KToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
+ tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
tact->setChecked(KMManager::self()->isFilterEnabled());
connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
- new KAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
- new KAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
+ new TDEAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
+ new TDEAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
- KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
+ TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
mact->setDelayed(false);
connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
@@ -412,7 +412,7 @@ void KMMainView::slotPrinterSelected(const TQString& prname)
void KMMainView::setViewType(int ID)
{
- ((KSelectAction*)m_actions->action("view_change"))->setCurrentItem(ID);
+ ((TDESelectAction*)m_actions->action("view_change"))->setCurrentItem(ID);
slotChangeView(ID);
}
@@ -468,8 +468,8 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
}
if (!printer->isSpecial())
{
- TQValueList<KAction*> pactions = m_actions->actions("plugin");
- for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+ TQValueList<TDEAction*> pactions = m_actions->actions("plugin");
+ for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
(*it)->plug(m_pop);
if (pactions.count() > 0)
m_pop->insertSeparator();
@@ -617,7 +617,7 @@ void KMMainView::slotSoftDefault()
void KMMainView::setOrientation(int o)
{
int ID = (o == Qt::Horizontal ? 1 : 0);
- ((KSelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
+ ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
slotChangeDirection(ID);
}
@@ -757,7 +757,7 @@ void KMMainView::slotShowPrinterInfos(bool on)
void KMMainView::enableToolbar(bool on)
{
- KToggleAction *act = (KToggleAction*)m_actions->action("view_toolbar");
+ TDEToggleAction *act = (TDEToggleAction*)m_actions->action("view_toolbar");
m_toolbar->setEnabled(on);
act->setEnabled(on);
if (on && act->isChecked())
@@ -766,7 +766,7 @@ void KMMainView::enableToolbar(bool on)
m_toolbar->hide();
}
-KAction* KMMainView::action(const char *name)
+TDEAction* KMMainView::action(const char *name)
{
return m_actions->action(name);
}
@@ -793,23 +793,23 @@ void KMMainView::reload()
void KMMainView::showPrinterInfos(bool on)
{
- static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on);
+ static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on);
slotShowPrinterInfos(on);
}
bool KMMainView::printerInfosShown() const
{
- return (static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->isChecked());
+ return (static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->isChecked());
}
void KMMainView::loadPluginActions()
{
KMFactory::self()->manager()->createPluginActions(m_actions);
- TQValueList<KAction*> pactions = m_actions->actions("plugin");
+ TQValueList<TDEAction*> pactions = m_actions->actions("plugin");
int index = m_pactionsindex;
//TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup();
TQPopupMenu *menu = m_menubar->getButton( 1 )->popup();
- for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+ for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
{
(*it)->plug(m_toolbar, index++);
( *it )->plug( menu );
@@ -818,8 +818,8 @@ void KMMainView::loadPluginActions()
void KMMainView::removePluginActions()
{
- TQValueList<KAction*> pactions = m_actions->actions("plugin");
- for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+ TQValueList<TDEAction*> pactions = m_actions->actions("plugin");
+ for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
{
(*it)->unplugAll();
delete (*it);
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index 7ed53a5c8..54cdffbc2 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -32,12 +32,12 @@ class KMManager;
class KMPrinterView;
class KMPrinter;
class KMPages;
-class KActionCollection;
+class TDEActionCollection;
class TQPopupMenu;
class TQTimer;
class TQSplitter;
-class KToolBar;
-class KAction;
+class TDEToolBar;
+class TDEAction;
class PluginComboBox;
class TQBoxLayout;
class MessageWindow;
@@ -54,7 +54,7 @@ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
{
Q_OBJECT
public:
- KMMainView(TQWidget *parent = 0, const char *name = 0, KActionCollection *coll = 0);
+ KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0);
~KMMainView();
void setOrientation(int);
@@ -62,7 +62,7 @@ public:
void setViewType(int);
int viewType() const;
void enableToolbar(bool on = true);
- KAction* action(const char *name);
+ TDEAction* action(const char *name);
void showPrinterInfos(bool on);
bool printerInfosShown() const;
@@ -115,17 +115,17 @@ private:
KMPrinterView *m_printerview;
KMPages *m_printerpages;
TQPopupMenu *m_pop;
- KActionCollection *m_actions;
+ TDEActionCollection *m_actions;
KMPrinter *m_current;
- KToolBar *m_toolbar;
+ TDEToolBar *m_toolbar;
PluginComboBox *m_plugin;
int m_pactionsindex;
TQStringList m_toollist;
bool m_first;
TQBoxLayout *m_boxlayout;
- class KMainWindowPrivate;
- KMainWindowPrivate *d;
- KToolBar *m_menubar;
+ class TDEMainWindowPrivate;
+ TDEMainWindowPrivate *d;
+ TDEToolBar *m_menubar;
};
TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index cd98a8b07..6fd8cf2dc 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -33,13 +33,13 @@
#include <kdialog.h>
#include <kdebug.h>
-class KRadioButton : public TQRadioButton
+class TDERadioButton : public TQRadioButton
{
public:
- KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0);
+ TDERadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0);
};
-KRadioButton::KRadioButton(const TQString& txt, TQWidget *parent, const char *name)
+TDERadioButton::TDERadioButton(const TQString& txt, TQWidget *parent, const char *name)
: TQRadioButton(txt,parent,name)
{
setCursor(KCursor::handCursor());
@@ -158,7 +158,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
}
else
{
- KRadioButton *btn = new KRadioButton(txt, this);
+ TDERadioButton *btn = new TDERadioButton(txt, this);
btn->setEnabled(on);
if ( !whatsThis.isEmpty() )
TQWhatsThis::add( btn, whatsThis );
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index a87388a6f..cadddf5d0 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -37,9 +37,9 @@ KMWClass::KMWClass(TQWidget *parent, const char *name)
m_title = i18n("Class Composition");
m_nextpage = KMWizard::Name;
- m_list1 = new KListBox(this);
+ m_list1 = new TDEListBox(this);
m_list1->setSelectionMode(TQListBox::Extended);
- m_list2 = new KListBox(this);
+ m_list2 = new TDEListBox(this);
m_list2->setSelectionMode(TQListBox::Extended);
TQToolButton *add = new TQToolButton(this);
diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h
index c9b63befb..a74f20117 100644
--- a/tdeprint/management/kmwclass.h
+++ b/tdeprint/management/kmwclass.h
@@ -22,7 +22,7 @@
#include "kmwizardpage.h"
-class KListBox;
+class TDEListBox;
class KMWClass : public KMWizardPage
{
@@ -40,7 +40,7 @@ protected slots:
void slotRemove();
private:
- KListBox *m_list1, *m_list2;
+ TDEListBox *m_list1, *m_list2;
};
#endif
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index 88b9410d5..94bf7d02e 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -38,7 +38,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
m_nextpage = KMWizard::DriverTest;
m_entries = NULL;
- m_list = new KListBox(this);
+ m_list = new TDEListBox(this);
TQLabel *l1 = new TQLabel(this);
l1->setText(i18n("<p>Several drivers have been detected for this model. Select the driver "
"you want to use. You will have the opportunity to test it as well as to "
diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h
index 464a78239..9c78008c1 100644
--- a/tdeprint/management/kmwdriverselect.h
+++ b/tdeprint/management/kmwdriverselect.h
@@ -23,7 +23,7 @@
#include "kmwizardpage.h"
#include "kmdbentry.h"
-class KListBox;
+class TDEListBox;
class TQPushButton;
class KMWDriverSelect : public KMWizardPage
@@ -40,7 +40,7 @@ protected slots:
void slotDriverComment();
private:
- KListBox *m_list;
+ TDEListBox *m_list;
KMDBEntryList *m_entries;
TQPushButton *m_drivercomment;
};
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index 7b56b2deb..624e87a44 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -41,7 +41,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
m_initialized = false;
m_block = false;
- m_ports = new KListView(this);
+ m_ports = new TDEListView(this);
m_ports->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_ports->setLineWidth(1);
m_ports->header()->hide();
diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h
index 681d94e51..e65128747 100644
--- a/tdeprint/management/kmwlocal.h
+++ b/tdeprint/management/kmwlocal.h
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
class TQLineEdit;
-class KListView;
+class TDEListView;
class TQListViewItem;
class KMWLocal : public KMWizardPage
@@ -47,7 +47,7 @@ protected:
TQListViewItem* lookForItem( const TQString& );
protected:
- KListView *m_ports;
+ TDEListView *m_ports;
TQLineEdit *m_localuri;
TQStringList m_uris;
TQListViewItem *m_parents[4];
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index ca5defde4..71a70f2e9 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -39,7 +39,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
m_ID = KMWizard::TCP;
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/management/kmwsocket.h b/tdeprint/management/kmwsocket.h
index 687b52fd4..7489d6ec7 100644
--- a/tdeprint/management/kmwsocket.h
+++ b/tdeprint/management/kmwsocket.h
@@ -22,7 +22,7 @@
#include "kmwizardpage.h"
-class KListView;
+class TDEListView;
class TQListViewItem;
class TQLineEdit;
class NetworkScanner;
@@ -43,7 +43,7 @@ protected slots:
void slotScanFinished();
private:
- KListView *m_list;
+ TDEListView *m_list;
NetworkScanner *m_scanner;
TQLineEdit *m_printer, *m_port;
};
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index e8e43ba09..df256f082 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -84,7 +84,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_xmlcmd = 0;
m_command = new TQLineEdit(this);
- m_view = new KListView(this);
+ m_view = new TDEListView(this);
m_view->addColumn("");
m_view->header()->hide();
m_view->setSorting(-1);
@@ -137,7 +137,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
TQLabel *m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1);
m_editlab1->setBuddy(m_edit1);
m_editlab2->setBuddy(m_edit2);
- m_values = new KListView(w2);
+ m_values = new TDEListView(w2);
m_values->addColumn(i18n("Name"));
m_values->addColumn(i18n("Description"));
m_values->setAllColumnsShowFocus(true);
@@ -841,7 +841,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
m_description = new TQLineEdit(topmain);
m_idname = new TQLabel(topmain);
- m_requirements = new KListView(m_gb2);
+ m_requirements = new TDEListView(m_gb2);
m_requirements->addColumn("");
m_requirements->header()->hide();
m_addreq = new TQToolButton(m_gb2);
@@ -850,8 +850,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
m_removereq->setIconSet(SmallIconSet("editdelete"));
TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain);
m_mimetype = new TQComboBox(dummy);
- m_availablemime = new KListBox(m_gb1);
- m_selectedmime = new KListBox(m_gb1);
+ m_availablemime = new TDEListBox(m_gb1);
+ m_selectedmime = new TDEListBox(m_gb1);
m_addmime = new TQToolButton(m_gb1);
m_addmime->setIconSet(TQApplication::reverseLayout()? SmallIconSet("forward") : SmallIconSet("back"));
m_removemime = new TQToolButton(m_gb1);
diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h
index 88e590325..d69c19e62 100644
--- a/tdeprint/management/kxmlcommanddlg.h
+++ b/tdeprint/management/kxmlcommanddlg.h
@@ -25,13 +25,13 @@
#include <tqstringlist.h>
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
class TQListViewItem;
class TQLineEdit;
class TQComboBox;
class TQWidgetStack;
class TQToolButton;
-class KListBox;
+class TDEListBox;
class TQListBoxItem;
class TQTextEdit;
class TQCheckBox;
@@ -74,11 +74,11 @@ protected slots:
void slotChanged();
private:
- KListView *m_view;
+ TDEListView *m_view;
TQLineEdit *m_name, *m_desc, *m_format, *m_default, *m_command;
TQComboBox *m_type;
TQWidget *m_dummy;
- KListView *m_values;
+ TDEListView *m_values;
TQLineEdit *m_edit1, *m_edit2;
TQWidgetStack *m_stack;
TQToolButton *m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down;
@@ -115,9 +115,9 @@ private:
TQLineEdit *m_description;
TQLabel *m_idname;
TQComboBox *m_mimetype;
- KListBox *m_availablemime, *m_selectedmime;
+ TDEListBox *m_availablemime, *m_selectedmime;
TQToolButton *m_addmime, *m_removemime;
- KListView *m_requirements;
+ TDEListView *m_requirements;
TQToolButton *m_removereq, *m_addreq;
TQStringList m_mimelist;
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 093d2a909..67627fb53 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -273,7 +273,7 @@ void KXmlCommandSelector::slotXmlCommandToggled( bool on )
void KXmlCommandSelector::slotHelpCommand()
{
- KPopupFrame *pop = new KPopupFrame( m_helpbtn );
+ TDEPopupFrame *pop = new TDEPopupFrame( m_helpbtn );
KActiveLabel *lab = new KActiveLabel( m_help, pop );
lab->resize( lab->sizeHint() );
pop->setMainWidget( lab );
diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp
index 0aa3c10a3..377a28217 100644
--- a/tdeprint/management/pluginaction.cpp
+++ b/tdeprint/management/pluginaction.cpp
@@ -21,7 +21,7 @@
// automatically connect to "pluginActionActived(int)" in the receiver.
PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name)
-: KAction(txt, icon, accel, parent, name), m_id(ID)
+: TDEAction(txt, icon, accel, parent, name), m_id(ID)
{
connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated()));
}
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index 0bb368ed2..1d77b71b7 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -22,7 +22,7 @@
#include <kaction.h>
-class TDEPRINT_EXPORT PluginAction : public KAction
+class TDEPRINT_EXPORT PluginAction : public TDEAction
{
Q_OBJECT
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index c5b40f942..10ac359f9 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -38,7 +38,7 @@
//*********************************************************************************************
SmbView::SmbView(TQWidget *parent, const char *name)
-: KListView(parent,name)
+: TDEListView(parent,name)
{
addColumn(i18n("Printer"));
addColumn(i18n("Comment"));
diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h
index 9b571f4dd..2226fd705 100644
--- a/tdeprint/management/smbview.h
+++ b/tdeprint/management/smbview.h
@@ -25,7 +25,7 @@
class TDEProcess;
class KTempFile;
-class SmbView : public KListView
+class SmbView : public TDEListView
{
Q_OBJECT
public: