diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /karbon/dialogs | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karbon/dialogs')
| -rw-r--r-- | karbon/dialogs/vcolordlg.cc | 2 | ||||
| -rw-r--r-- | karbon/dialogs/vcolortab.cc | 2 | ||||
| -rw-r--r-- | karbon/dialogs/vconfiguredlg.cc | 2 | ||||
| -rw-r--r-- | karbon/dialogs/vstrokedlg.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc index 90548045..ae8e399a 100644 --- a/karbon/dialogs/vcolordlg.cc +++ b/karbon/dialogs/vcolordlg.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vcolor.h" #include "vcolordlg.h" diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc index 56fecc0b..0b2c3bab 100644 --- a/karbon/dialogs/vcolortab.cc +++ b/karbon/dialogs/vcolortab.cc @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "vcolor.h" diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 3e353484..bc4e5eb1 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kcolorbutton.h> #include <KoUnitWidgets.h> diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc index 2428de11..27009bf2 100644 --- a/karbon/dialogs/vstrokedlg.cc +++ b/karbon/dialogs/vstrokedlg.cc @@ -26,7 +26,7 @@ #include <tqvbuttongroup.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "KoUnitWidgets.h" |