diff options
| author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
| commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
| tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/colors | |
| parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
| parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
| download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/colors')
| -rw-r--r-- | kcontrol/colors/colorscm.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/colors/widgetcanvas.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 1572f4b7b..45e3932da 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -26,11 +26,11 @@ #include <kcursor.h> #include <tdefiledialog.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> #include <kipc.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <tdeaboutdata.h> diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 684e9d6d3..b08ef6135 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -15,9 +15,9 @@ #include <kcolordrag.h> #include <kpixmapeffect.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include "widgetcanvas.h" @@ -280,7 +280,7 @@ void WidgetCanvas::drawSampleWidgets() TDEConfig * c = new TDEConfig("kcmfonts"); - // Keep in sync with kglobalsettings. + // Keep in sync with tdeglobalsettings. TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); windowFontGuess.setPixelSize(12); |