summaryrefslogtreecommitdiffstats
path: root/tdeprint/kprinter
diff options
context:
space:
mode:
authorAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
committerAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /tdeprint/kprinter
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 'tdeprint/kprinter')
-rw-r--r--tdeprint/kprinter/main.cpp2
-rw-r--r--tdeprint/kprinter/printwrapper.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index 95ab3bac1..fd528b705 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions options[] =
{
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 78370ccc6..102951ffd 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <stdlib.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <tqregexp.h>
@@ -34,12 +34,12 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kprinter.h>
#include <tdeprint/kmmanager.h>