diff options
| author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/kpalette.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kpalette.cpp')
| -rw-r--r-- | tdecore/kpalette.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 073dff626..7335e8e14 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <ksavefile.h> #include <kstringhandler.h> @@ -34,7 +34,7 @@ TQStringList KPalette::getPaletteList() { TQStringList paletteList; - KGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); + TDEGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); int strip = strlen("colors/"); for(TQStringList::Iterator it = paletteList.begin(); |