summaryrefslogtreecommitdiffstats
path: root/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp')
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index fb2c07163..9f939324a 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -42,7 +42,7 @@
#include <tqsettings.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <kprinter.h>
#include "Misc.h"
#include "KFileFontIconView.h"
@@ -52,7 +52,7 @@
#include <tdetoolbarbutton.h>
#include <tdestdaccel.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
#include <tdeio/job.h>