diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /klipper | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'klipper')
| -rw-r--r-- | klipper/configdialog.cpp | 2 | ||||
| -rw-r--r-- | klipper/configdialog.h | 2 | ||||
| -rw-r--r-- | klipper/klipper.desktop | 2 | ||||
| -rw-r--r-- | klipper/klipperpopup.cpp | 2 | ||||
| -rw-r--r-- | klipper/klipperpopup.h | 2 | ||||
| -rw-r--r-- | klipper/popupproxy.h | 2 | ||||
| -rw-r--r-- | klipper/toplevel.cpp | 2 | ||||
| -rw-r--r-- | klipper/toplevel.h | 2 | ||||
| -rw-r--r-- | klipper/urlgrabber.cpp | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 0c1b5379a..1a4c66e1f 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> diff --git a/klipper/configdialog.h b/klipper/configdialog.h index c77514857..345a9f052 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -30,7 +30,7 @@ #include <kdialogbase.h> #include <keditlistbox.h> #include <kkeydialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <knuminput.h> #include "urlgrabber.h" diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop index 32dbf8d9c..36cc043f9 100644 --- a/klipper/klipper.desktop +++ b/klipper/klipper.desktop @@ -154,7 +154,7 @@ Comment[sk]=Vystrihnúť a vložiť históriu Comment[sl]=Orodje z zgodovino za izreži in prilepi Comment[sr]=Алат за историјат исецања и преношења Comment[sr@Latn]=Alat za istorijat isecanja i prenošenja -Comment[sv]=Ett verktyg med historik för klipp ut och klistra in +Comment[sv]=Ett verktyg med historik för klipp ut och tdelistra in Comment[th]=โปรแกรมอรรถประโยชน์สำหรับดูประวัติการตัดและวาง Comment[tr]=Kes & yapıştır geçmişine erişim Comment[uk]=Утиліта історії кишені diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 048ea8b1b..7b2eed57c 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -25,7 +25,7 @@ #include <klineedit.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobalsettings.h> #include <twin.h> #include <kapplication.h> diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h index a9849e8c3..ea800c675 100644 --- a/klipper/klipperpopup.h +++ b/klipper/klipperpopup.h @@ -20,7 +20,7 @@ #ifndef _KLIPPERPOPUP_H_ #define _KLIPPERPOPUP_H_ -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqptrlist.h> #include <tqstring.h> diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h index 6526a8c55..bc99daea2 100644 --- a/klipper/popupproxy.h +++ b/klipper/popupproxy.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqregexp.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <history.h> class HistoryItem; diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index f9254dee3..a2777d071 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -32,7 +32,7 @@ #include <tqdragobject.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kglobal.h> diff --git a/klipper/toplevel.h b/klipper/toplevel.h index dc2682ea2..cdc5ffa02 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kglobalaccel.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqmap.h> #include <tqpixmap.h> #include <dcopobject.h> diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index 5a93f1c10..dd832bf01 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -26,7 +26,7 @@ #include <kdialogbase.h> #include <ktextedit.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kservice.h> #include <kiconloader.h> #include <kdebug.h> |