diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:29 -0600 |
| commit | 9dea9bbfaa7a09a9bd01bb40750d7a5f5b3600f8 (patch) | |
| tree | 84a51a95f768711c288a5d47db27c4eab7ac0937 /extra/kde311 | |
| parent | 2d00595867197e5b5563d85e871a59a77a23f70f (diff) | |
| download | pytde-9dea9bbfaa7a09a9bd01bb40750d7a5f5b3600f8.tar.gz pytde-9dea9bbfaa7a09a9bd01bb40750d7a5f5b3600f8.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'extra/kde311')
| -rw-r--r-- | extra/kde311/kkeyserver_x11.h | 2 | ||||
| -rw-r--r-- | extra/kde311/kpanelmenu.h | 2 | ||||
| -rw-r--r-- | extra/kde311/tdeaccelaction.h | 2 | ||||
| -rw-r--r-- | extra/kde311/tdeaccelbase.h | 4 | ||||
| -rw-r--r-- | extra/kde311/tdetoolbarbutton.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/extra/kde311/kkeyserver_x11.h b/extra/kde311/kkeyserver_x11.h index 4169273..517dcae 100644 --- a/extra/kde311/kkeyserver_x11.h +++ b/extra/kde311/kkeyserver_x11.h @@ -1,7 +1,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde311/kpanelmenu.h b/extra/kde311/kpanelmenu.h index 639d029..6749754 100644 --- a/extra/kde311/kpanelmenu.h +++ b/extra/kde311/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include <tqstring.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kgenericfactory.h> class KPanelMenuPrivate; diff --git a/extra/kde311/tdeaccelaction.h b/extra/kde311/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde311/tdeaccelaction.h +++ b/extra/kde311/tdeaccelaction.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class TDEAccelBase; diff --git a/extra/kde311/tdeaccelbase.h b/extra/kde311/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde311/tdeaccelbase.h +++ b/extra/kde311/tdeaccelbase.h @@ -26,7 +26,7 @@ #include <tqvaluevector.h> #include <tqvaluelist.h> -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver_x11.h" class TQPopupMenu; @@ -116,7 +116,7 @@ class TQWidget; * menu structure. * * @short Configurable key binding support. - * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $ + * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $ */ class TDEAccelBase diff --git a/extra/kde311/tdetoolbarbutton.h b/extra/kde311/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde311/tdetoolbarbutton.h +++ b/extra/kde311/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $ +// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -305,7 +305,7 @@ private: /** * List of @ref TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $ */ class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton> { |