summaryrefslogtreecommitdiffstats
path: root/kdepasswd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kdepasswd
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdepasswd')
-rw-r--r--kdepasswd/kcm/chfacedlg.cpp4
-rw-r--r--kdepasswd/kcm/kcm_useraccount.kcfg2
-rw-r--r--kdepasswd/kcm/main.cpp4
-rw-r--r--kdepasswd/kdepasswd.cpp4
-rw-r--r--kdepasswd/passwddlg.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp
index a63de1af9..0a3dbfb78 100644
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@@ -35,12 +35,12 @@
#include <tqcheckbox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kiconview.h>
#include <kimagefilepreview.h>
#include <kimageio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <konq_operations.h>
#include <kurl.h>
diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/kdepasswd/kcm/kcm_useraccount.kcfg
index b741d418e..549afdb1e 100644
--- a/kdepasswd/kcm/kcm_useraccount.kcfg
+++ b/kdepasswd/kcm/kcm_useraccount.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <include>kglobal.h</include>
+ <include>tdeglobal.h</include>
<include>kstandarddirs.h</include>
<kcfgfile name="tdm/tdmrc"/>
<group name="X-*-Greeter">
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index f65a5fefb..18ecbb445 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -32,7 +32,7 @@
#include <kpushbutton.h>
#include <kguiitem.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
#include <kpassdlg.h>
#include <kuser.h>
#include <kdialog.h>
@@ -40,7 +40,7 @@
#include <kstandarddirs.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp
index 1f108e2cf..6f1c38aa3 100644
--- a/kdepasswd/kdepasswd.cpp
+++ b/kdepasswd/kdepasswd.cpp
@@ -9,10 +9,10 @@
#include <config.h>
#include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kuser.h>
#include <kdebug.h>
diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp
index 833195031..7aee3fe52 100644
--- a/kdepasswd/passwddlg.cpp
+++ b/kdepasswd/passwddlg.cpp
@@ -6,8 +6,8 @@
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "passwd.h"
#include "passwddlg.h"