TQt4 convert kde-systemsettings

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-systemsettings@1234247 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 20 insertions, 20 deletions

diff --git a/systemsettings/kcmodulemenu.cpp b/systemsettings/kcmodulemenu.cpp
index 8208ec0..3d36388 100644
--- a/systemsettings/kcmodulemenu.cpp
+++ b/systemsettings/kcmodulemenu.cpp
@@ -22,18 +22,18 @@
 #include <kapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
-#include <qdict.h>
+#include <tqdict.h>
 
 class KCModuleMenuPrivate {
 public:
 	KCModuleMenuPrivate(){
 	}
 				
-	QMap<QString, QValueList<MenuItem> > menus;
-	QString basePath;
+	TQMap<TQString, TQValueList<MenuItem> > menus;
+	TQString basePath;
 };
 
-KCModuleMenu::KCModuleMenu( const QString &menuName ) :
+KCModuleMenu::KCModuleMenu( const TQString &menuName ) :
 	d( new KCModuleMenuPrivate )
 {
 	kdDebug() << "MenuName: \"" << menuName << "\"." << endl;
@@ -53,7 +53,7 @@ KCModuleMenu::~KCModuleMenu()
 	delete d;
 }
 
-void KCModuleMenu::readMenu( const QString &pathName )
+void KCModuleMenu::readMenu( const TQString &pathName )
 {
 	KServiceGroup::Ptr group = KServiceGroup::group( pathName );
 	if ( !group || !group->isValid() )
@@ -64,7 +64,7 @@ void KCModuleMenu::readMenu( const QString &pathName )
 		return;
 
 	caption = group->caption();
-	QValueList<MenuItem> currentMenu;
+	TQValueList<MenuItem> currentMenu;
 			
 	for( KServiceGroup::List::ConstIterator it = list.begin();
 			 it != list.end(); it++)
@@ -108,12 +108,12 @@ bool KCModuleMenu::addEntry( KSycocaEntry *entry ){
 }
 
 
-QValueList<KCModuleInfo> KCModuleMenu::modules( const QString &menuPath )
+TQValueList<KCModuleInfo> KCModuleMenu::modules( const TQString &menuPath )
 {
-	QValueList<KCModuleInfo> list;
+	TQValueList<KCModuleInfo> list;
 
-	QValueList<MenuItem> subMenu = menuList(menuPath);
-	QValueList<MenuItem>::iterator it;
+	TQValueList<MenuItem> subMenu = menuList(menuPath);
+	TQValueList<MenuItem>::iterator it;
 	for ( it = subMenu.begin(); it != subMenu.end(); ++it ){
 		if ( !(*it).menu )
 			list.append( (*it).item );
@@ -122,12 +122,12 @@ QValueList<KCModuleInfo> KCModuleMenu::modules( const QString &menuPath )
 	return list;
 }
 
-QStringList KCModuleMenu::submenus( const QString &menuPath )
+TQStringList KCModuleMenu::submenus( const TQString &menuPath )
 {
-	QStringList list;
+	TQStringList list;
 
-	QValueList<MenuItem> subMenu = menuList(menuPath);
-	QValueList<MenuItem>::iterator it;
+	TQValueList<MenuItem> subMenu = menuList(menuPath);
+	TQValueList<MenuItem>::iterator it;
 	for ( it = subMenu.begin(); it != subMenu.end(); ++it ){
 		if ( (*it).menu )
 			list.append( (*it).subMenu );
@@ -136,11 +136,11 @@ QStringList KCModuleMenu::submenus( const QString &menuPath )
 	return list;
 }
 
-QValueList<MenuItem> KCModuleMenu::menuList( const QString &menuPath )
+TQValueList<MenuItem> KCModuleMenu::menuList( const TQString &menuPath )
 {
 	if( menuPath.isEmpty() ) {
 		if( d->basePath.isEmpty())
-			return QValueList<MenuItem>();
+			return TQValueList<MenuItem>();
 		else
 			return menuList( d->basePath );
 	}
@@ -171,12 +171,12 @@ QValueList<MenuItem> KCModuleMenu::menuList( const QString &menuPath )
  *
  * "Michael D. Stemle, Jr." <[email protected]>
  */
-QString KCModuleMenu::deriveCaptionFromPath( const QString &menuPath )
+TQString KCModuleMenu::deriveCaptionFromPath( const TQString &menuPath )
 {
-	QStringList parts(QStringList::split("/",menuPath));
-	QString result("");
+	TQStringList parts(TQStringList::split("/",menuPath));
+	TQString result("");
 
-	QStringList::Iterator it = parts.end(); // Start at the end
+	TQStringList::Iterator it = parts.end(); // Start at the end
 
 	// Find the last non-empty string in the split.
 	for (; it != parts.begin(); --it) {