From ae3203e4a4717c90e6364c5a66a0d9a5dd5b7c4d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:14:14 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 systemsettings/kcmodulemenu.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'systemsettings/kcmodulemenu.cpp')

diff --git a/systemsettings/kcmodulemenu.cpp b/systemsettings/kcmodulemenu.cpp
index 3d36388..24660d9 100644
--- a/systemsettings/kcmodulemenu.cpp
+++ b/systemsettings/kcmodulemenu.cpp
@@ -24,17 +24,17 @@
 #include <kdebug.h>
 #include <tqdict.h>
 
-class KCModuleMenuPrivate {
+class TDECModuleMenuPrivate {
 public:
-	KCModuleMenuPrivate(){
+	TDECModuleMenuPrivate(){
 	}
 				
 	TQMap<TQString, TQValueList<MenuItem> > menus;
 	TQString basePath;
 };
 
-KCModuleMenu::KCModuleMenu( const TQString &menuName ) :
-	d( new KCModuleMenuPrivate )
+TDECModuleMenu::TDECModuleMenu( const TQString &menuName ) :
+	d( new TDECModuleMenuPrivate )
 {
 	kdDebug() << "MenuName: \"" << menuName << "\"." << endl;
 	// Make sure we can find the menu
@@ -48,12 +48,12 @@ KCModuleMenu::KCModuleMenu( const TQString &menuName ) :
 	readMenu( d->basePath );
 }
 
-KCModuleMenu::~KCModuleMenu()
+TDECModuleMenu::~TDECModuleMenu()
 {
 	delete d;
 }
 
-void KCModuleMenu::readMenu( const TQString &pathName )
+void TDECModuleMenu::readMenu( const TQString &pathName )
 {
 	KServiceGroup::Ptr group = KServiceGroup::group( pathName );
 	if ( !group || !group->isValid() )
@@ -71,7 +71,7 @@ void KCModuleMenu::readMenu( const TQString &pathName )
 	{
 		KSycocaEntry *entry = (*it);
 		if( addEntry(entry) ) {
-			KCModuleInfo module((KService*)entry);
+			TDECModuleInfo module((KService*)entry);
 			append(module);
 			MenuItem infoItem(false);
 			infoItem.caption = this->deriveCaptionFromPath(entry->name());
@@ -92,7 +92,7 @@ void KCModuleMenu::readMenu( const TQString &pathName )
 	d->menus.insert( pathName, currentMenu );
 }
 
-bool KCModuleMenu::addEntry( KSycocaEntry *entry ){
+bool TDECModuleMenu::addEntry( KSycocaEntry *entry ){
 	if( !entry->isType(KST_KService) )
 		return false;
 	
@@ -100,7 +100,7 @@ bool KCModuleMenu::addEntry( KSycocaEntry *entry ){
 	if ( !kapp->authorizeControlModule( service->menuId()) )
 		return false;
 
-	KCModuleInfo module( service );
+	TDECModuleInfo module( service );
 	if ( module.library().isEmpty() )
 		return false;
 
@@ -108,9 +108,9 @@ bool KCModuleMenu::addEntry( KSycocaEntry *entry ){
 }
 
 
-TQValueList<KCModuleInfo> KCModuleMenu::modules( const TQString &menuPath )
+TQValueList<TDECModuleInfo> TDECModuleMenu::modules( const TQString &menuPath )
 {
-	TQValueList<KCModuleInfo> list;
+	TQValueList<TDECModuleInfo> list;
 
 	TQValueList<MenuItem> subMenu = menuList(menuPath);
 	TQValueList<MenuItem>::iterator it;
@@ -122,7 +122,7 @@ TQValueList<KCModuleInfo> KCModuleMenu::modules( const TQString &menuPath )
 	return list;
 }
 
-TQStringList KCModuleMenu::submenus( const TQString &menuPath )
+TQStringList TDECModuleMenu::submenus( const TQString &menuPath )
 {
 	TQStringList list;
 
@@ -136,7 +136,7 @@ TQStringList KCModuleMenu::submenus( const TQString &menuPath )
 	return list;
 }
 
-TQValueList<MenuItem> KCModuleMenu::menuList( const TQString &menuPath )
+TQValueList<MenuItem> TDECModuleMenu::menuList( const TQString &menuPath )
 {
 	if( menuPath.isEmpty() ) {
 		if( d->basePath.isEmpty())
@@ -171,7 +171,7 @@ TQValueList<MenuItem> KCModuleMenu::menuList( const TQString &menuPath )
  *
  * "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
  */
-TQString KCModuleMenu::deriveCaptionFromPath( const TQString &menuPath )
+TQString TDECModuleMenu::deriveCaptionFromPath( const TQString &menuPath )
 {
 	TQStringList parts(TQStringList::split("/",menuPath));
 	TQString result("");
-- 
cgit v1.2.1