diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdeio/bookmarks | |
| parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
| download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeio/bookmarks')
| -rw-r--r-- | tdeio/bookmarks/kbookmarkbar.cc | 6 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkbar.h | 2 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkmanager.h | 2 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkmenu.cc | 4 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkmenu.h | 2 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkmenu_p.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc index b1ebb94fa..5c5f64ecc 100644 --- a/tdeio/bookmarks/kbookmarkbar.cc +++ b/tdeio/bookmarks/kbookmarkbar.cc @@ -28,11 +28,11 @@ #include <kbookmarkmenu.h> #include <kdebug.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "kbookmarkdrag.h" #include "kbookmarkmenu_p.h" diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h index 2f5495cda..93241cdaf 100644 --- a/tdeio/bookmarks/kbookmarkbar.h +++ b/tdeio/bookmarks/kbookmarkbar.h @@ -25,7 +25,7 @@ #include <tqguardedptr.h> #include <tqptrlist.h> #include <kbookmark.h> -#include <kaction.h> +#include <tdeaction.h> class TDEToolBar; class KBookmarkMenu; diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h index 4a129704a..6931e9842 100644 --- a/tdeio/bookmarks/kbookmarkmanager.h +++ b/tdeio/bookmarks/kbookmarkmanager.h @@ -167,7 +167,7 @@ public: /** * @return true if the NS bookmarks should be dynamically shown - * in the toplevel kactionmenu + * in the toplevel tdeactionmenu * @deprecated */ bool showNSBookmarks() const; diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc index ff9f8d4ec..c99d02284 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cc +++ b/tdeio/bookmarks/kbookmarkmenu.cc @@ -34,8 +34,8 @@ #include <klineedit.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kstdaccel.h> +#include <tdepopupmenu.h> +#include <tdestdaccel.h> #include <kstdaction.h> #include <kstringhandler.h> diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h index 003077202..0c1ebb27c 100644 --- a/tdeio/bookmarks/kbookmarkmenu.h +++ b/tdeio/bookmarks/kbookmarkmenu.h @@ -31,7 +31,7 @@ #include <kdialogbase.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include "kbookmark.h" #include "kbookmarkmanager.h" diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h index dff3e6f30..fc34e9029 100644 --- a/tdeio/bookmarks/kbookmarkmenu_p.h +++ b/tdeio/bookmarks/kbookmarkmenu_p.h @@ -31,7 +31,7 @@ #include <kdialogbase.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include "kbookmark.h" #include "kbookmarkimporter.h" |