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 /kpersonalizer | |
| 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 'kpersonalizer')
| -rw-r--r-- | kpersonalizer/keyecandypage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kospage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kpersonalizer.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kstylepage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kstylepagedlg.ui | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 1aa8f422f..48c001175 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -31,7 +31,7 @@ #include <dcopclient.h> #include <kipc.h> #include <kapplication.h> -#include <klistview.h> +#include <tdelistview.h> #include <krun.h> #include <kmessagebox.h> #include <kiconloader.h> diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 6b7590bd3..26964e0fa 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -42,7 +42,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) slotKDEDescription(); // Set the configfiles cglobal = new TDEConfig("kdeglobals"); - claunch = new TDEConfig("klaunchrc", false, false); + claunch = new TDEConfig("tdelaunchrc", false, false); cwin = new TDEConfig("twinrc"); cdesktop = new TDEConfig("kdesktoprc"); ckcminput = new TDEConfig("kcminputrc"); diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 1a3dcc40e..dfd7319e9 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -31,7 +31,7 @@ #include <kstandarddirs.h> #include <klocale.h> #include <kapplication.h> -#include <klistview.h> +#include <tdelistview.h> #include <krun.h> #include <kmessagebox.h> #include <tdeconfig.h> diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index a44084608..09a993916 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kipc.h> #include <ksimpleconfig.h> #include <dcopclient.h> diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index 9a11887d3..b9b6b7ac8 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -120,7 +120,7 @@ </image> </images> <includes> - <include location="global" impldecl="in declaration">klistview.h</include> + <include location="global" impldecl="in declaration">tdelistview.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> |