diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /konqueror/listview | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/listview')
| -rw-r--r-- | konqueror/listview/konq_infolistviewitem.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_infolistviewwidget.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.h | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewitems.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.cc | 4 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewitem.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewitem.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 056fbe757..5f4a0f636 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -21,7 +21,7 @@ #include <konq_settings.h> #include <tdefilemetainfo.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdio.h> #include <tqpainter.h> diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index ef77cc1bd..fab798906 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -21,7 +21,7 @@ #include "konq_infolistviewitem.h" #include "konq_listview.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdefilemetainfo.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 3d1090e1f..7d0a8d628 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kdirlister.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_drag.h> #include <kpropertiesdialog.h> #include <kstdaction.h> diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 5b175e13a..f7592d73f 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -21,7 +21,7 @@ #define __konq_listview_h__ #include <tdeparts/browserextension.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <konq_operations.h> #include <tdeparts/factory.h> #include <konq_dirpart.h> diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 0077c6da5..12952fb23 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -20,7 +20,7 @@ #include "konq_listview.h" #include <konq_settings.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdio.h> #include <tqpainter.h> diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 673362063..c885aef42 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -27,11 +27,11 @@ #include <kdebug.h> #include <kdirlister.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprotocolinfo.h> #include <tdeaction.h> #include <kurldrag.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kiconeffect.h> diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index ac63cd443..3919d6c82 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -22,7 +22,7 @@ #include <assert.h> #include <stdio.h> -#include <kglobal.h> +#include <tdeglobal.h> int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index cbeda1730..506c1b592 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -23,7 +23,7 @@ #include <tqlistview.h> #include <tqstring.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include "konq_listviewitems.h" #include "konq_textviewwidget.h" |