diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:00 -0600 |
| commit | 5b341c1d7f5e40a531de253b2c6ba37a427146e7 (patch) | |
| tree | 118204e14298c7f1a58535622686696afb4c64cb /src/ksvnwidgets | |
| parent | 13e480c92e41a25f2ff3e3a13062e57f183e19ed (diff) | |
| download | tdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.tar.gz tdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/ksvnwidgets')
| -rw-r--r-- | src/ksvnwidgets/authdialogimpl.cpp | 2 | ||||
| -rw-r--r-- | src/ksvnwidgets/depthselector.cpp | 2 | ||||
| -rw-r--r-- | src/ksvnwidgets/diffbrowser.cpp | 8 | ||||
| -rw-r--r-- | src/ksvnwidgets/diffsyntax.cpp | 4 | ||||
| -rw-r--r-- | src/ksvnwidgets/encodingselector_impl.cpp | 2 | ||||
| -rw-r--r-- | src/ksvnwidgets/logmsg_impl.cpp | 6 | ||||
| -rw-r--r-- | src/ksvnwidgets/ssltrustprompt_impl.cpp | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index 879e49d..fc9ab46 100644 --- a/src/ksvnwidgets/authdialogimpl.cpp +++ b/src/ksvnwidgets/authdialogimpl.cpp @@ -22,7 +22,7 @@ #include <kpassdlg.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 331edc4..6840ec9 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -20,7 +20,7 @@ #include "depthselector.h" #include "version_check.hpp" -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index bfbe346..a77e77f 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -22,13 +22,13 @@ #include "diffbrowserdata.h" #include "tdesvnsettings.h" -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfont.h> #include <tqtooltip.h> diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp index 60a95de..d35ec96 100644 --- a/src/ksvnwidgets/diffsyntax.cpp +++ b/src/ksvnwidgets/diffsyntax.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "diffsyntax.h" -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp index 265b1eb..83f7fbe 100644 --- a/src/ksvnwidgets/encodingselector_impl.cpp +++ b/src/ksvnwidgets/encodingselector_impl.cpp @@ -20,7 +20,7 @@ #include "encodingselector_impl.h" #include <kdebug.h> #include <kcharsets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqcombobox.h> diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index 41a197b..aae4d0f 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -24,15 +24,15 @@ #include <ktextedit.h> #include <kcombobox.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kapp.h> #include <tdeconfigbase.h> #include <tdeconfig.h> #include <kurlrequesterdlg.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefile.h> #include <kurlrequester.h> diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index d55080b..7b4d5b6 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -20,12 +20,12 @@ #include "ssltrustprompt_impl.h" #include "tdesvnsettings.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqtable.h> #include <tqvbox.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kapp.h> #include <tdeconfigbase.h> #include <tdeconfig.h> |