diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/privacy | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/privacy')
| -rw-r--r-- | kcontrol/privacy/kcmprivacydialog.ui | 2 | ||||
| -rw-r--r-- | kcontrol/privacy/kprivacymanager.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/privacy/privacy.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/privacy/privacy.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index 5c2afe250..05d23882a 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -194,7 +194,7 @@ </vbox> </widget> <includes> - <include location="global" impldecl="in implementation">klistview.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="global" impldecl="in implementation">ktextedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 13b376cd4..cfed89e7a 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -27,7 +27,7 @@ #include <kglobal.h> #include <kapplication.h> #include <kdebug.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kstandarddirs.h> #include <tqstringlist.h> diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index c175384c2..dc2dcacc5 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <ktextedit.h> diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 495b2fa6c..18d234230 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -22,7 +22,7 @@ #define _PRIVACY_H_ #include <tdecmodule.h> -#include <klistview.h> +#include <tdelistview.h> #include "kcmprivacydialog.h" #include "kprivacymanager.h" |