diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kcoloredit | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcoloredit')
| -rw-r--r-- | kcoloredit/colorselector.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/gradientselection.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/kcolorchooser.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/kcoloredit.cpp | 6 | ||||
| -rw-r--r-- | kcoloredit/kcoloreditdoc.cpp | 4 | ||||
| -rw-r--r-- | kcoloredit/kcoloreditview.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/loadpalettedlg.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/main.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/palette.cpp | 4 | ||||
| -rw-r--r-- | kcoloredit/paletteviewscrolledarea.cpp | 2 | ||||
| -rw-r--r-- | kcoloredit/texteditselection.cpp | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index ba041c4e..6dfbf08a 100644 --- a/kcoloredit/colorselector.cpp +++ b/kcoloredit/colorselector.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqslider.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "imageselection.h" diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index 37ea901a..df0769d0 100644 --- a/kcoloredit/gradientselection.cpp +++ b/kcoloredit/gradientselection.cpp @@ -19,7 +19,7 @@ #include <tqframe.h> #include <tqradiobutton.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "gradientselection.h" diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 70a983f6..50b83f1a 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcolordialog.h" diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index d5079fa6..f933bea9 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -22,10 +22,10 @@ // include files for KDE #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> -#include <kmenubar.h> -#include <klocale.h> +#include <tdemenubar.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp index b5823b1b..dac11879 100644 --- a/kcoloredit/kcoloreditdoc.cpp +++ b/kcoloredit/kcoloreditdoc.cpp @@ -22,8 +22,8 @@ #include <tqclipboard.h> // include files for KDE -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // application specific includes #include "kcoloreditdoc.h" diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index b52296d7..ecc29b18 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/kcoloredit/kcoloreditview.cpp @@ -26,7 +26,7 @@ // include files for KDE #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> // application specific includes #include "main.h" diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index ead23eff..057dbe7c 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kpalette.h> #include <tdefiledialog.h> diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index accb3f0c..ea1ec9d3 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kcoloredit.h" diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp index 0c0a0747..53b8af82 100644 --- a/kcoloredit/palette.cpp +++ b/kcoloredit/palette.cpp @@ -19,9 +19,9 @@ #include <tqstringlist.h> #include <tqtextstream.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "color.h" diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index b0524ebf..3a70aacc 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -25,7 +25,7 @@ #include <tqpen.h> #include <tqfontmetrics.h> #include <tqtimer.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcolordrag.h> #include <tqscrollbar.h> diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index d32e054e..f1da81a1 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -19,7 +19,7 @@ #include <tqvalidator.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "texteditselection.h" |