Rename a number of classes to enhance compatibility with KDE4

6 files changed, 15 insertions, 15 deletions

diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 735b5106..1c8854e9 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -402,7 +402,7 @@ void KNewsTicker::setupArrowButton()
 }
 
 KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *parent, const char *name)
-  : KPopupMenu(parent, name),
+  : TDEPopupMenu(parent, name),
 	m_parent(parent),
 	m_fullMenu(false)
 {
@@ -428,7 +428,7 @@ void KNewsTickerMenu::populateMenu()
 	for (; nIt != sources.end(); ++nIt) {
 		NewsSourceBase::Ptr ns = *nIt;
 
-		KPopupMenu *submenu = new KPopupMenu;
+		TDEPopupMenu *submenu = new TDEPopupMenu;
 		int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
 		setItemParameter(checkNewsId, sources.findIndex(ns));
 
diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h
index 85c57ce3..c70f568b 100644
--- a/knewsticker/knewsticker.h
+++ b/knewsticker/knewsticker.h
@@ -120,7 +120,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
 		TQStringList          m_pendingNewsUpdates;
 };
 
-class KNewsTickerMenu : public KPopupMenu
+class KNewsTickerMenu : public TDEPopupMenu
 {
 	Q_OBJECT
 //	
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index aec193cb..6bb6407c 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -103,7 +103,7 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent,  const
 	m_child->niInterval->setRange(4, 180);
 
 	m_child->lvNewsSources->setShowSortIndicator(true);
-	m_child->lvNewsSources->setSelectionModeExt(KListView::Extended);
+	m_child->lvNewsSources->setSelectionModeExt(TDEListView::Extended);
 	m_child->lvNewsSources->setAcceptDrops(true);
 	m_child->lvNewsSources->viewport()->setAcceptDrops(true);
 	m_child->lvNewsSources->viewport()->installEventFilter(this);
@@ -112,8 +112,8 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent,  const
 	connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQT_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &)));
 	connect(m_child->bChooseFont, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseFont()));
 
-	connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)),
-			TQT_SLOT(slotNewsSourceContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
+	connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+			TQT_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 	connect(m_child->lvNewsSources, TQT_SIGNAL(selectionChanged()),
 			TQT_SLOT(slotNewsSourceSelectionChanged()));
 	connect(m_child->lvNewsSources, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
@@ -221,7 +221,7 @@ void KNewsTickerConfig::save()
 bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e)
 {
 	//<HACK>
-	// 	"if ( e->type() == TQEvent::DragEnter ) {" shoult normaly be enough. but there must be a bug somewhere in KListView.
+	// 	"if ( e->type() == TQEvent::DragEnter ) {" shoult normaly be enough. but there must be a bug somewhere in TDEListView.
 	if ( e->type() == TQEvent::DragMove ) {
 	//</HACK>
 		TQDragEnterEvent *d = (TQDragEnterEvent*)e;
@@ -349,12 +349,12 @@ void KNewsTickerConfig::removeFilter(TQListViewItem *item)
 	}
 }
 
-void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *item, const TQPoint &)
+void KNewsTickerConfig::slotNewsSourceContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &)
 {
 	if (!dynamic_cast<NewsSourceItem *>(item))
 		return;
 
-	KPopupMenu *menu = new KPopupMenu();
+	TDEPopupMenu *menu = new TDEPopupMenu();
 
 	TQPixmap addIcon = SmallIcon(TQString::fromLatin1("news_subscribe"));
 	TQPixmap modifyIcon = SmallIcon(TQString::fromLatin1("edit"));
@@ -388,11 +388,11 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i
 
 void KNewsTickerConfig::slotChooseFont()
 {
-	KFontDialog fd(this, "Font Dialog", false, true);
+	TDEFontDialog fd(this, "Font Dialog", false, true);
 
 	fd.setFont(m_font);
 
-	if (fd.exec() == KFontDialog::Accepted) {
+	if (fd.exec() == TDEFontDialog::Accepted) {
 		if (m_font != fd.font()) {
 			m_font = fd.font();
 		}
diff --git a/knewsticker/knewstickerconfig.h b/knewsticker/knewstickerconfig.h
index 057372cf..559cdf29 100644
--- a/knewsticker/knewstickerconfig.h
+++ b/knewsticker/knewstickerconfig.h
@@ -78,7 +78,7 @@ class KNewsTickerConfig : public KDialogBase
 		void getNewsIcon(NewsSourceItem *, const KURL &);
 
 	protected slots:
-		void slotNewsSourceContextMenu(KListView *, TQListViewItem *, const TQPoint &);
+		void slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &);
 		void slotChooseFont();
 		void slotAddNewsSource();
 		void slotAddFilter();
diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui
index 72f73171..200144c7 100644
--- a/knewsticker/knewstickerconfigwidget.ui
+++ b/knewsticker/knewstickerconfigwidget.ui
@@ -244,7 +244,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case
                     <property name="spacing">
                         <number>4</number>
                     </property>
-                    <widget class="KListView" row="0" column="0" rowspan="1" colspan="4">
+                    <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
                                 <string>Name of Site</string>
@@ -382,7 +382,7 @@ Note that you can also right-click on the list to open a menu which lets you add
                     <property name="spacing">
                         <number>4</number>
                     </property>
-                    <widget class="KListView" row="0" column="0" rowspan="1" colspan="3">
+                    <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3">
                         <column>
                             <property name="text">
                                 <string>Action</string>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
index fa2f0751..beb57001 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
@@ -173,7 +173,7 @@
                 <string>This list shows the headlines and links to the corresponding complete articles which have been stored in the source file whose properties you are watching.</string>
             </property>
         </widget>
-        <widget class="KListBox" row="5" column="0" rowspan="1" colspan="5">
+        <widget class="TDEListBox" row="5" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>lbArticles</cstring>
             </property>