Rename a number of classes to enhance compatibility with KDE4

7 files changed, 23 insertions, 23 deletions

diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index d2b23bfc4..9795ef014 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -52,7 +52,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e)
 		KSystemTray::mousePressEvent(e);
 	else if (m_app->m_views.count() > 0)
 	{
-		KPopupMenu	menu;
+		TDEPopupMenu	menu;
 		TQDictIterator<KMJobViewer>	it(m_app->m_views);
 		TQPtrList<KMJobViewer>	list;
 		list.setAutoDelete(false);
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index d32f33ea8..212d96988 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -38,7 +38,7 @@
 ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 : TQWidget(parent, name)
 {
-	m_filters = new KListView(this);
+	m_filters = new TDEListView(this);
 	m_filters->addColumn(i18n("Mime Type"));
 	m_filters->addColumn(i18n("Command"));
 	m_filters->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
diff --git a/tdeprint/tdeprintfax/conffilters.h b/tdeprint/tdeprintfax/conffilters.h
index 871b44bec..ca796b934 100644
--- a/tdeprint/tdeprintfax/conffilters.h
+++ b/tdeprint/tdeprintfax/conffilters.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqpushbutton.h>
-class KListView;
+class TDEListView;
 
 class ConfFilters : public TQWidget
 {
@@ -41,7 +41,7 @@ protected slots:
 	void slotDown();
 	void updateButton();
 private:
-	KListView	*m_filters;
+	TDEListView	*m_filters;
 	TQPushButton	*m_add,*m_remove,*m_up,*m_down,*m_change;
 };
 
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index 6cc0e115f..97b2986cc 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -37,7 +37,7 @@
 FaxAB::FaxAB(TQWidget *parent, const char *name)
 : KDialog(parent, name, true)
 {
-	m_list = new KListView( this );
+	m_list = new TDEListView( this );
 	m_list->addColumn( i18n( "Name" ) );
 	m_list->addColumn( i18n( "Fax Number" ) );
 	m_list->header()->setStretchEnabled( true, 0 );
diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h
index 8b50c204a..abf40de2f 100644
--- a/tdeprint/tdeprintfax/faxab.h
+++ b/tdeprint/tdeprintfax/faxab.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <kabc/phonenumber.h>
 
-class KListView;
+class TDEListView;
 class AddressBook;
 class TQPushButton;
 
@@ -56,7 +56,7 @@ private:
 		TQString           m_enterprise;
 	};
 
-	KListView*                  m_list;
+	TDEListView*                  m_list;
 	TQMap<TQString,FaxABEntry>    m_entries;
 	TQPushButton*                m_ok;
 };
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 015bf7172..38e15425b 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -58,7 +58,7 @@
 #include <kdebug.h>
 
 KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
-: KMainWindow(parent, name)
+: TDEMainWindow(parent, name)
 {
 	m_faxctrl = new FaxCtrl(this);
 	m_quitAfterSend = false;
@@ -67,7 +67,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 
 	TQWidget	*mainw = new TQWidget(this);
 	setCentralWidget(mainw);
-	m_files = new KListBox(mainw);
+	m_files = new TDEListBox(mainw);
 	connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) );
 	m_upbtn = new KPushButton( mainw );
 	m_upbtn->setIconSet( SmallIconSet( "up" ) );
@@ -83,7 +83,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
         m_filelabel->setBuddy(m_files);
         KSeparator*m_line = new KSeparator( KSeparator::HLine, mainw);
 		KSeparator *m_line2 = new KSeparator( KSeparator::HLine, mainw );
-	m_numbers = new KListView( mainw );
+	m_numbers = new TDEListView( mainw );
 	m_numbers->addColumn( i18n("Fax Number") );
 	m_numbers->addColumn( i18n("Name") );
 	m_numbers->addColumn( i18n("Enterprise") );
@@ -188,14 +188,14 @@ KdeprintFax::~KdeprintFax()
 
 void KdeprintFax::initActions()
 {
-	new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
-	new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
-	new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
-	new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
-	new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
-	new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
-	new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
-	new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+	new TDEAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+	new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
+	new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
+	new TDEAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
+	new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
+	new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
+	new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
+	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
 
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h
index 4645434ad..192ba7b14 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.h
+++ b/tdeprint/tdeprintfax/tdeprintfax.h
@@ -24,8 +24,8 @@
 #include <kmainwindow.h>
 #include <kurl.h>
 
-class KListBox;
-class KListView;
+class TDEListBox;
+class TDEListView;
 class TQLineEdit;
 class TQTextEdit;
 class FaxCtrl;
@@ -36,7 +36,7 @@ class TQComboBox;
 class TQPushButton;
 class TQListViewItem;
 
-class KdeprintFax : public KMainWindow
+class KdeprintFax : public TDEMainWindow
 {
 	Q_OBJECT
 public:
@@ -98,8 +98,8 @@ protected:
 	//TQListViewItem* faxItem( int i = 0 ) const;
 
 private:
-	KListBox	*m_files;
-	KListView   *m_numbers;
+	TDEListBox	*m_files;
+	TDEListView   *m_numbers;
 	TQLineEdit	*m_subject;
 	TQTextEdit	*m_comment;
 	FaxCtrl		*m_faxctrl;