diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
commit | bd3c603465110b74a0ddcee72e6f020a78d44e59 (patch) | |
tree | f556266a927227ba3f30e337c4ccf06facc55ea3 /languages/ruby | |
parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/ruby')
-rw-r--r-- | languages/ruby/debugger/breakpoint.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/breakpoint.h | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgpsdlg.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgtoolbar.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/debuggerpart.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/debugger/framestackwidget.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbbreakpointwidget.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbcontroller.cpp | 6 | ||||
-rw-r--r-- | languages/ruby/debugger/rdboutputwidget.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/stty.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/variablewidget.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/qtdesignerrubyintegration.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/rubyimplementationwidget.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/rubysupport_part.cpp | 2 |
14 files changed, 20 insertions, 20 deletions
diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp index 8504ce93..cdffc0cf 100644 --- a/languages/ruby/debugger/breakpoint.cpp +++ b/languages/ruby/debugger/breakpoint.cpp @@ -21,7 +21,7 @@ #include "breakpoint.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqfontmetrics.h> diff --git a/languages/ruby/debugger/breakpoint.h b/languages/ruby/debugger/breakpoint.h index a184f33b..77daf5b7 100644 --- a/languages/ruby/debugger/breakpoint.h +++ b/languages/ruby/debugger/breakpoint.h @@ -22,7 +22,7 @@ #ifndef _BREAKPOINT_H_ #define _BREAKPOINT_H_ -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index e5fb76d0..bfe27c8f 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -23,8 +23,8 @@ #include <kbuttonbox.h> #include <kdialog.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index de750ba0..c9283d98 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -25,7 +25,7 @@ #include <kdockwindow.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <twin.h> diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 2994387a..9a47fc8b 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -28,12 +28,12 @@ #include <tdefiledialog.h> #include <kdevgenericfactory.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> #include <kstatusbar.h> #include <tdeparts/part.h> #include <tdetexteditor/viewcursorinterface.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tqtimer.h> diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 5d3a606e..9cbce258 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -22,7 +22,7 @@ #include "framestackwidget.h" #include "rdbparser.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqheader.h> diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index f28ea1de..d7e73c82 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kurl.h> diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 3bb6392b..9abc42ae 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -40,9 +40,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tqdatetime.h> diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 5e67752d..7f2d58aa 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -27,7 +27,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 28fc9b95..e2ed413c 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -63,7 +63,7 @@ #include <tqstring.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeapplication.h> diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 83945d3e..f03007ec 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -36,7 +36,7 @@ #include <tqpushbutton.h> #include <tqregexp.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpoint.h> #include <tqclipboard.h> diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp index f2412739..a7759f12 100644 --- a/languages/ruby/qtdesignerrubyintegration.cpp +++ b/languages/ruby/qtdesignerrubyintegration.cpp @@ -23,9 +23,9 @@ #include <tqpair.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/view.h> diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 9b11be96..44355c45 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -26,8 +26,8 @@ #include <tqtextstream.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <filetemplate.h> #include <kdevlanguagesupport.h> diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index c3bfff85..e1745a02 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdevgenericfactory.h> #include <kprocess.h> #include <kdebug.h> |