From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:11:21 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 4 ++--
 konqueror/remoteencodingplugin/kremoteencodingplugin.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'konqueror/remoteencodingplugin')

diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index b4de7a003..5e669972b 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -48,7 +48,7 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
 					     const TQStringList &)
   : KParts::Plugin(parent, name), m_loaded(false), m_idDefault(0)
 {
-  m_menu = new KActionMenu(i18n("Select Remote Charset"), "charset",
+  m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset",
 			   actionCollection(), "changeremoteencoding");
   connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()),
 	  this, TQT_SLOT(slotAboutToShow()));
@@ -111,7 +111,7 @@ KRemoteEncodingPlugin::slotAboutToOpenURL()
 void
 KRemoteEncodingPlugin::fillMenu()
 {
-  KPopupMenu *menu = m_menu->popupMenu();
+  TDEPopupMenu *menu = m_menu->popupMenu();
   menu->clear();
 
   TQStringList::ConstIterator it;
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index 9b80888a5..d5469cd47 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -26,7 +26,7 @@
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
 
-class KActionMenu;
+class TDEActionMenu;
 class TDEConfig;
 class KonqDirPart;
 
@@ -52,7 +52,7 @@ private:
   void updateMenu();
 
   KonqDirPart *m_part;
-  KActionMenu *m_menu;
+  TDEActionMenu *m_menu;
   TQStringList m_encodingDescriptions;
   KURL m_currentURL;
 
-- 
cgit v1.2.3