diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:52:00 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:52:00 -0600 |
commit | 5b341c1d7f5e40a531de253b2c6ba37a427146e7 (patch) | |
tree | 118204e14298c7f1a58535622686696afb4c64cb /src/svnfrontend | |
parent | 13e480c92e41a25f2ff3e3a13062e57f183e19ed (diff) | |
download | tdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.tar.gz tdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/svnfrontend')
26 files changed, 44 insertions, 44 deletions
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 0c6fc69..0acc9bc 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -26,12 +26,12 @@ #include "encodingselector_impl.h" #include <tdelistview.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialogbase.h> #include <kapp.h> #include <ktextbrowser.h> diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index ab0090c..572b2a4 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -24,7 +24,7 @@ #include "ssltrustprompt_impl.h" #include "pwstorage.h" -#include <klocale.h> +#include <tdelocale.h> #include <kapp.h> #include <kinputdialog.h> #include <kpassdlg.h> diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index 7fc9bb1..953f33a 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -31,11 +31,11 @@ #include "copymoveview_impl.h" #include <kapp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <ktextbrowser.h> diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp index f635cf8..6ece8d0 100644 --- a/src/svnfrontend/copymoveview_impl.cpp +++ b/src/svnfrontend/copymoveview_impl.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <tqvbox.h> diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index dad19a8..c87ff8b 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -23,9 +23,9 @@ #include <ktextedit.h> #include <kcombobox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "editproperty_impl.h" diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 3de0b26..615ea4c 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -27,7 +27,7 @@ #include "url.hpp" #include "widgetblockstack.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefileitem.h> #include <kdebug.h> diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index e6904ac..f7619fe 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -28,7 +28,7 @@ #include <tqobject.h> #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot) : TQThread(),mutex(),m_SvnContextListener(0) diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp index 85f8891..3dad68d 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp @@ -28,7 +28,7 @@ #include <klineedit.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> CheckoutInfo_impl::CheckoutInfo_impl(TQWidget *parent, const char *name) diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp index 55bb0be..9e7aa76 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.cpp +++ b/src/svnfrontend/fronthelpers/propertyitem.cpp @@ -1,5 +1,5 @@ #include "propertyitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> PropertyListViewItem::PropertyListViewItem(TDEListView *parent,const TQString&aName,const TQString&aValue) diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 49fdb36..1f46571 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -20,9 +20,9 @@ #include "propertylist.h" #include "propertyitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> Propertylist::Propertylist(TQWidget *parent, const char *name) diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp index 7ad1d37..861baa1 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp @@ -26,7 +26,7 @@ #include <knuminput.h> #include <kdatetimewidget.h> #include <tqbuttongroup.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name) diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 3172df1..66e299a 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -25,7 +25,7 @@ #include <kdialog.h> #include <tdefiledialog.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index afa9cb3..5dc6f6e 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -30,7 +30,7 @@ #include <tqstyle.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index a9fb8f5..416b6e9 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -27,12 +27,12 @@ #include <kapp.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktempdir.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtooltip.h> #include <tqwmatrix.h> diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index da7cf59..be11aa2 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -32,11 +32,11 @@ #include <kdebug.h> #include <kprogress.h> -#include <klocale.h> +#include <tdelocale.h> #include <kapp.h> #include <tdelistview.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqwidget.h> #include <tqdatetime.h> diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index c3e5eee..8dfd03e 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -21,7 +21,7 @@ #include "version_check.hpp" -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlayout.h> diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index b0c1d87..c8efc54 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -25,7 +25,7 @@ #include <kurlrequester.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index a6f131c..aa9d090 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -20,7 +20,7 @@ #include "opencontextmenu.h" #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> OpenContextmenu::OpenContextmenu(const KURL&aPath,const TDETrader::OfferList&aList,TQWidget* parent, const char* name) : TQPopupMenu(parent, name),m_Path(aPath),m_List(aList) diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index cd5281b..b4f8b7e 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -32,8 +32,8 @@ #include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 9e7663e..8c6077d 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -23,7 +23,7 @@ #include "stringhelper.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <tqtimer.h> #include <tqpushbutton.h> diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index c60df43..9171a00 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -55,13 +55,13 @@ #include <kdialog.h> #include <ktextbrowser.h> -#include <klocale.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kprocess.h> #include <ktempdir.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdialogbase.h> #include <tdeapplication.h> #include <tdeio/jobclasses.h> diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index e44b057..462a32e 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -21,7 +21,7 @@ #include "svnitem.h" #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index 4fd207e..0e70cbf 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -28,8 +28,8 @@ #include "sub2qt.h" #include "ktranslateurl.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <kiconeffect.h> diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index e7ce9d8..5f8b69a 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -27,8 +27,8 @@ #include <tdelistview.h> #include <ktextbrowser.h> #include <kpushbutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kapp.h> #include <tdeconfigbase.h> #include <tdeconfig.h> diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp index 3947712..eaa4d14 100644 --- a/src/svnfrontend/tcontextlistener.cpp +++ b/src/svnfrontend/tcontextlistener.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> ThreadContextListener::ThreadContextListener(TQObject* parent, const char* name) : CContextListener(parent, name) diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index ed40235..83c0467 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -44,10 +44,10 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kdirwatch.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeactioncollection.h> #include <tdeshortcut.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdirselectdialog.h> #include <klineedit.h> #include <tdefileitem.h> @@ -55,7 +55,7 @@ #include <tdefiledialog.h> #include <kdebug.h> #include <kurldrag.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include <krun.h> #include <kurldrag.h> |