From d51fe868191540f7deafdd608c5ed3763996b830 Mon Sep 17 00:00:00 2001 From: Jekyll Wu Date: Thu, 5 Apr 2012 04:30:27 +0800 Subject: [PATCH] QList ==> QStringList --- src/Application.cpp | 2 +- src/ColorSchemeManager.cpp | 8 ++++---- src/ColorSchemeManager.h | 7 +++---- src/EditProfileDialog.cpp | 2 +- src/KeyboardTranslatorManager.cpp | 2 +- src/KeyboardTranslatorManager.h | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index 2f2e79f54..ba71333db 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -324,7 +324,7 @@ bool Application::processHelpArgs(KCmdLineArgs* args) void Application::listAvailableProfiles() { - QList paths = ProfileManager::instance()->availableProfilePaths(); + QStringList paths = ProfileManager::instance()->availableProfilePaths(); foreach ( const QString& path, paths) { QFileInfo info(path); diff --git a/src/ColorSchemeManager.cpp b/src/ColorSchemeManager.cpp index 26cdd5192..9309a1862 100644 --- a/src/ColorSchemeManager.cpp +++ b/src/ColorSchemeManager.cpp @@ -184,7 +184,7 @@ void ColorSchemeManager::loadAllColorSchemes() int success = 0; int failed = 0; - QList nativeColorSchemes = listColorSchemes(); + QStringList nativeColorSchemes = listColorSchemes(); foreach ( const QString& colorScheme, nativeColorSchemes) { if (loadColorScheme(colorScheme)) success++; @@ -192,7 +192,7 @@ void ColorSchemeManager::loadAllColorSchemes() failed++; } - QList kde3ColorSchemes = listKDE3ColorSchemes(); + QStringList kde3ColorSchemes = listKDE3ColorSchemes(); foreach ( const QString& colorScheme, kde3ColorSchemes) { if (loadKDE3ColorScheme(colorScheme)) success++; @@ -275,14 +275,14 @@ bool ColorSchemeManager::loadKDE3ColorScheme(const QString& filePath) return true; } -QList ColorSchemeManager::listColorSchemes() +QStringList ColorSchemeManager::listColorSchemes() { return KGlobal::dirs()->findAllResources("data", "konsole/*.colorscheme", KStandardDirs::NoDuplicates); } -QList ColorSchemeManager::listKDE3ColorSchemes() +QStringList ColorSchemeManager::listKDE3ColorSchemes() { return KGlobal::dirs()->findAllResources("data", "konsole/*.schema", diff --git a/src/ColorSchemeManager.h b/src/ColorSchemeManager.h index 0a36823ce..5f519f70e 100644 --- a/src/ColorSchemeManager.h +++ b/src/ColorSchemeManager.h @@ -23,9 +23,8 @@ #define COLORSCHEMEMANAGER_H // Qt -#include #include -#include +#include // Konsole #include "ColorScheme.h" @@ -100,10 +99,10 @@ private: // loads a color scheme from a KDE 3 .schema file bool loadKDE3ColorScheme(const QString& path); // returns a list of paths of color schemes in the KDE 4+ .colorscheme file format - QList listColorSchemes(); + QStringList listColorSchemes(); // returns a list of paths of color schemes in the .schema file format // used in KDE 3 - QList listKDE3ColorSchemes(); + QStringList listKDE3ColorSchemes(); // loads all of the color schemes void loadAllColorSchemes(); // finds the path of a color scheme diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index 52eb70600..b30bd3403 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -543,7 +543,7 @@ void EditProfileDialog::updateKeyBindingsList(bool selectCurrentTranslator) QStandardItem* selectedItem = 0; - QList translatorNames = keyManager->allTranslators(); + QStringList translatorNames = keyManager->allTranslators(); foreach (const QString& translatorName, translatorNames) { const KeyboardTranslator* translator = keyManager->findTranslator(translatorName); diff --git a/src/KeyboardTranslatorManager.cpp b/src/KeyboardTranslatorManager.cpp index 2e08b29d8..1c8eb2f4c 100644 --- a/src/KeyboardTranslatorManager.cpp +++ b/src/KeyboardTranslatorManager.cpp @@ -186,7 +186,7 @@ const KeyboardTranslator* KeyboardTranslatorManager::defaultTranslator() return translator; } -QList KeyboardTranslatorManager::allTranslators() +QStringList KeyboardTranslatorManager::allTranslators() { if (!_haveLoadedAll) { findTranslators(); diff --git a/src/KeyboardTranslatorManager.h b/src/KeyboardTranslatorManager.h index d459be047..135a8eb14 100644 --- a/src/KeyboardTranslatorManager.h +++ b/src/KeyboardTranslatorManager.h @@ -24,7 +24,7 @@ // Qt #include -#include +#include // Konsole #include "konsole_export.h" @@ -84,7 +84,7 @@ public: * The first time this is called, a search for available * translators is started. */ - QList allTranslators(); + QStringList allTranslators(); /** Returns the global KeyboardTranslatorManager instance. */ static KeyboardTranslatorManager* instance();