diff --git a/ChangeLog b/ChangeLog index 6a6351d..999f783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,7 +178,7 @@ Version dirSize in kdirsize.sip for older KDE ------------------------------------------------------------------------ r87 | (jim) | 2005-12-18 09:51:33 -0800 (Sun, 18 Dec 2005) | 4 lines -Fixed versioning bug for enum Other in kshortcutlist.sip; +Fixed versioning bug for enum Other in tdeshortcutlist.sip; added fully-qualified names to two 'Other' arguments in method calls diff --git a/Changelog b/Changelog index 9a0bd52..8181917 100644 --- a/Changelog +++ b/Changelog @@ -355,7 +355,7 @@ Version dirSize in kdirsize.sip for older KDE ------------------------------------------------------------------------ r87 | (no author) | 2005-12-18 09:51:33 -0800 (Sun, 18 Dec 2005) | 4 lines -Fixed versioning bug for enum Other in kshortcutlist.sip; +Fixed versioning bug for enum Other in tdeshortcutlist.sip; added fully-qualified names to two 'Other' arguments in method calls diff --git a/doc/classref/tdeui/TDEAction.html b/doc/classref/tdeui/TDEAction.html index 7f97f98..ac3f430 100644 --- a/doc/classref/tdeui/TDEAction.html +++ b/doc/classref/tdeui/TDEAction.html @@ -273,7 +273,7 @@ indexint
-
  • kaccelCount () +
  • tdeaccelCount ()
    returns (uint)
    In versions KDE 3.1.0 and above only
    • diff --git a/doc/classref/tdeui/TDEActionCollection.html b/doc/classref/tdeui/TDEActionCollection.html index 5a52df3..b614e40 100644 --- a/doc/classref/tdeui/TDEActionCollection.html +++ b/doc/classref/tdeui/TDEActionCollection.html @@ -374,11 +374,11 @@
    returns (bool)
    In versions KDE 3.2.0 and above only
    -
  • kaccel () +
  • tdeaccel ()
    returns (TDEAccel)
    In versions KDE 3.1.0 and above, but less than KDE 3.5.3
    • -
  • kaccel () +
  • tdeaccel ()
    returns (TDEAccel)
    In versions KDE 3.2.0 and above only
    • diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py index ac469bf..e50f934 100644 --- a/examples/xmlmenudemo.py +++ b/examples/xmlmenudemo.py @@ -174,7 +174,7 @@ class MainWin (TDEMainWindow): # in the rc file # Just fake some filenames for now - fakeFiles = ["kaction.sip", "kxmlguiclient.sip"] + fakeFiles = ["tdeaction.sip", "kxmlguiclient.sip"] # Clear the old entries, so we don't end up accumulating entries in the menu self.unplugActionList("recent"); diff --git a/extra/kde300/kkeyserver_x11.h b/extra/kde300/kkeyserver_x11.h index f0b4dbe..0929285 100644 --- a/extra/kde300/kkeyserver_x11.h +++ b/extra/kde300/kkeyserver_x11.h @@ -1,7 +1,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" namespace KKeyServer diff --git a/extra/kde300/tdeaccelaction.h b/extra/kde300/tdeaccelaction.h index bd85a25..1ee45c2 100644 --- a/extra/kde300/tdeaccelaction.h +++ b/extra/kde300/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde300/tdeaccelbase.h b/extra/kde300/tdeaccelbase.h index 0fbbe79..8e6deb1 100644 --- a/extra/kde300/tdeaccelbase.h +++ b/extra/kde300/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver_x11.h" class TQPopupMenu; @@ -116,7 +116,7 @@ class TDEAccelBasePrivate; * menu structure. * * @short Configurable key binding support. - * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ + * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ */ class TDEAccelBase diff --git a/extra/kde300/tdetoolbarbutton.h b/extra/kde300/tdetoolbarbutton.h index a708ee3..94d87cc 100644 --- a/extra/kde300/tdetoolbarbutton.h +++ b/extra/kde300/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $ +// $Id: tdetoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -294,7 +294,7 @@ private: /** * List of @ref TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde301/kkeyserver_x11.h b/extra/kde301/kkeyserver_x11.h index f0b4dbe..0929285 100644 --- a/extra/kde301/kkeyserver_x11.h +++ b/extra/kde301/kkeyserver_x11.h @@ -1,7 +1,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" namespace KKeyServer diff --git a/extra/kde301/tdeaccelaction.h b/extra/kde301/tdeaccelaction.h index bd85a25..1ee45c2 100644 --- a/extra/kde301/tdeaccelaction.h +++ b/extra/kde301/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde301/tdeaccelbase.h b/extra/kde301/tdeaccelbase.h index 0fbbe79..8e6deb1 100644 --- a/extra/kde301/tdeaccelbase.h +++ b/extra/kde301/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver_x11.h" class TQPopupMenu; @@ -116,7 +116,7 @@ class TDEAccelBasePrivate; * menu structure. * * @short Configurable key binding support. - * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ + * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ */ class TDEAccelBase diff --git a/extra/kde301/tdetoolbarbutton.h b/extra/kde301/tdetoolbarbutton.h index e34c4fe..bdf8bb0 100644 --- a/extra/kde301/tdetoolbarbutton.h +++ b/extra/kde301/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $ +// $Id: tdetoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -301,7 +301,7 @@ private: /** * List of @ref TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde303/kkeyserver_x11.h b/extra/kde303/kkeyserver_x11.h index f0b4dbe..0929285 100644 --- a/extra/kde303/kkeyserver_x11.h +++ b/extra/kde303/kkeyserver_x11.h @@ -1,7 +1,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" namespace KKeyServer diff --git a/extra/kde303/tdeaccelaction.h b/extra/kde303/tdeaccelaction.h index bd85a25..1ee45c2 100644 --- a/extra/kde303/tdeaccelaction.h +++ b/extra/kde303/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde303/tdeaccelbase.h b/extra/kde303/tdeaccelbase.h index 0fbbe79..8e6deb1 100644 --- a/extra/kde303/tdeaccelbase.h +++ b/extra/kde303/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver_x11.h" class TQPopupMenu; @@ -116,7 +116,7 @@ class TDEAccelBasePrivate; * menu structure. * * @short Configurable key binding support. - * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ + * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $ */ class TDEAccelBase diff --git a/extra/kde303/tdetoolbarbutton.h b/extra/kde303/tdetoolbarbutton.h index 990504c..4ac8947 100644 --- a/extra/kde303/tdetoolbarbutton.h +++ b/extra/kde303/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $ +// $Id: tdetoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -301,7 +301,7 @@ private: /** * List of @ref TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde310/kkeyserver_x11.h b/extra/kde310/kkeyserver_x11.h index 4169273..517dcae 100644 --- a/extra/kde310/kkeyserver_x11.h +++ b/extra/kde310/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/kde310/kpanelmenu.h b/extra/kde310/kpanelmenu.h index b58decb..b96b15e 100644 --- a/extra/kde310/kpanelmenu.h +++ b/extra/kde310/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde310/tdeaccelaction.h b/extra/kde310/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde310/tdeaccelaction.h +++ b/extra/kde310/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde310/tdeaccelbase.h b/extra/kde310/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde310/tdeaccelbase.h +++ b/extra/kde310/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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/kde310/tdetoolbarbutton.h b/extra/kde310/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde310/tdetoolbarbutton.h +++ b/extra/kde310/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 { 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 -#include +#include #include 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 #include -#include +#include 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 #include -#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 { diff --git a/extra/kde312/kkeyserver_x11.h b/extra/kde312/kkeyserver_x11.h index 4169273..517dcae 100644 --- a/extra/kde312/kkeyserver_x11.h +++ b/extra/kde312/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/kde312/kpanelmenu.h b/extra/kde312/kpanelmenu.h index b58decb..b96b15e 100644 --- a/extra/kde312/kpanelmenu.h +++ b/extra/kde312/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde312/tdeaccelaction.h b/extra/kde312/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde312/tdeaccelaction.h +++ b/extra/kde312/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde312/tdeaccelbase.h b/extra/kde312/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde312/tdeaccelbase.h +++ b/extra/kde312/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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/kde312/tdetoolbarbutton.h b/extra/kde312/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde312/tdetoolbarbutton.h +++ b/extra/kde312/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 { diff --git a/extra/kde313/kkeyserver_x11.h b/extra/kde313/kkeyserver_x11.h index 4169273..517dcae 100644 --- a/extra/kde313/kkeyserver_x11.h +++ b/extra/kde313/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/kde313/kpanelmenu.h b/extra/kde313/kpanelmenu.h index b58decb..b96b15e 100644 --- a/extra/kde313/kpanelmenu.h +++ b/extra/kde313/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde313/tdeaccelaction.h b/extra/kde313/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde313/tdeaccelaction.h +++ b/extra/kde313/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde313/tdeaccelbase.h b/extra/kde313/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde313/tdeaccelbase.h +++ b/extra/kde313/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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/kde313/tdetoolbarbutton.h b/extra/kde313/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde313/tdetoolbarbutton.h +++ b/extra/kde313/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 { diff --git a/extra/kde314/kkeyserver_x11.h b/extra/kde314/kkeyserver_x11.h index a7fa366..26d9bec 100644 --- a/extra/kde314/kkeyserver_x11.h +++ b/extra/kde314/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/kde314/kpanelmenu.h b/extra/kde314/kpanelmenu.h index e66aee4..649791c 100644 --- a/extra/kde314/kpanelmenu.h +++ b/extra/kde314/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde314/tdeaccelaction.h b/extra/kde314/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde314/tdeaccelaction.h +++ b/extra/kde314/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde314/tdeaccelbase.h b/extra/kde314/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde314/tdeaccelbase.h +++ b/extra/kde314/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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/kde314/tdetoolbarbutton.h b/extra/kde314/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde314/tdetoolbarbutton.h +++ b/extra/kde314/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 { diff --git a/extra/kde315/kkeyserver_x11.h b/extra/kde315/kkeyserver_x11.h index a7fa366..26d9bec 100644 --- a/extra/kde315/kkeyserver_x11.h +++ b/extra/kde315/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/kde315/kpanelmenu.h b/extra/kde315/kpanelmenu.h index e66aee4..649791c 100644 --- a/extra/kde315/kpanelmenu.h +++ b/extra/kde315/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde315/tdeaccelaction.h b/extra/kde315/tdeaccelaction.h index 28c52d2..4ad018f 100644 --- a/extra/kde315/tdeaccelaction.h +++ b/extra/kde315/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde315/tdeaccelbase.h b/extra/kde315/tdeaccelbase.h index 807c426..21ee3a3 100644 --- a/extra/kde315/tdeaccelbase.h +++ b/extra/kde315/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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/kde315/tdetoolbarbutton.h b/extra/kde315/tdetoolbarbutton.h index 7dd41f8..bea5bbe 100644 --- a/extra/kde315/tdetoolbarbutton.h +++ b/extra/kde315/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 { diff --git a/extra/kde320/kkeyserver_x11.h b/extra/kde320/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde320/kkeyserver_x11.h +++ b/extra/kde320/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/kde320/kpanelmenu.h b/extra/kde320/kpanelmenu.h index b2e7265..3ef1764 100644 --- a/extra/kde320/kpanelmenu.h +++ b/extra/kde320/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde320/kurifilter.h b/extra/kde320/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde320/kurifilter.h +++ b/extra/kde320/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde320/tdeaccelaction.h b/extra/kde320/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde320/tdeaccelaction.h +++ b/extra/kde320/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde320/tdeaccelbase.h b/extra/kde320/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde320/tdeaccelbase.h +++ b/extra/kde320/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde320/tdetoolbarbutton.h b/extra/kde320/tdetoolbarbutton.h index 2c80447..6201d1d 100644 --- a/extra/kde320/tdetoolbarbutton.h +++ b/extra/kde320/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde321/kkeyserver_x11.h b/extra/kde321/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde321/kkeyserver_x11.h +++ b/extra/kde321/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/kde321/kpanelmenu.h b/extra/kde321/kpanelmenu.h index b2e7265..3ef1764 100644 --- a/extra/kde321/kpanelmenu.h +++ b/extra/kde321/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde321/kurifilter.h b/extra/kde321/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde321/kurifilter.h +++ b/extra/kde321/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde321/tdeaccelaction.h b/extra/kde321/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde321/tdeaccelaction.h +++ b/extra/kde321/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde321/tdeaccelbase.h b/extra/kde321/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde321/tdeaccelbase.h +++ b/extra/kde321/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde321/tdetoolbarbutton.h b/extra/kde321/tdetoolbarbutton.h index 2c80447..6201d1d 100644 --- a/extra/kde321/tdetoolbarbutton.h +++ b/extra/kde321/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde322/kkeyserver_x11.h b/extra/kde322/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde322/kkeyserver_x11.h +++ b/extra/kde322/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/kde322/kpanelmenu.h b/extra/kde322/kpanelmenu.h index b2e7265..3ef1764 100644 --- a/extra/kde322/kpanelmenu.h +++ b/extra/kde322/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde322/kurifilter.h b/extra/kde322/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde322/kurifilter.h +++ b/extra/kde322/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde322/tdeaccelaction.h b/extra/kde322/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde322/tdeaccelaction.h +++ b/extra/kde322/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde322/tdeaccelbase.h b/extra/kde322/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde322/tdeaccelbase.h +++ b/extra/kde322/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde322/tdetoolbarbutton.h b/extra/kde322/tdetoolbarbutton.h index 2c80447..6201d1d 100644 --- a/extra/kde322/tdetoolbarbutton.h +++ b/extra/kde322/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde323/kkeyserver_x11.h b/extra/kde323/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde323/kkeyserver_x11.h +++ b/extra/kde323/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/kde323/kpanelmenu.h b/extra/kde323/kpanelmenu.h index b2e7265..3ef1764 100644 --- a/extra/kde323/kpanelmenu.h +++ b/extra/kde323/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde323/kurifilter.h b/extra/kde323/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde323/kurifilter.h +++ b/extra/kde323/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde323/tdeaccelaction.h b/extra/kde323/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde323/tdeaccelaction.h +++ b/extra/kde323/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde323/tdeaccelbase.h b/extra/kde323/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde323/tdeaccelbase.h +++ b/extra/kde323/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde323/tdetoolbarbutton.h b/extra/kde323/tdetoolbarbutton.h index 2c80447..6201d1d 100644 --- a/extra/kde323/tdetoolbarbutton.h +++ b/extra/kde323/tdetoolbarbutton.h @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ #ifndef _KTOOLBARBUTTON_H #define _KTOOLBARBUTTON_H @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde330/kkeyserver_x11.h b/extra/kde330/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde330/kkeyserver_x11.h +++ b/extra/kde330/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/kde330/kpanelmenu.h b/extra/kde330/kpanelmenu.h index fd9c00c..c0ea523 100644 --- a/extra/kde330/kpanelmenu.h +++ b/extra/kde330/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde330/kurifilter.h b/extra/kde330/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde330/kurifilter.h +++ b/extra/kde330/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde330/tdeaccelaction.h b/extra/kde330/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde330/tdeaccelaction.h +++ b/extra/kde330/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde330/tdeaccelbase.h b/extra/kde330/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde330/tdeaccelbase.h +++ b/extra/kde330/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde330/tdetoolbarbutton.h b/extra/kde330/tdetoolbarbutton.h index 724e26b..27936a8 100644 --- a/extra/kde330/tdetoolbarbutton.h +++ b/extra/kde330/tdetoolbarbutton.h @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde331/kkeyserver_x11.h b/extra/kde331/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde331/kkeyserver_x11.h +++ b/extra/kde331/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/kde331/kpanelmenu.h b/extra/kde331/kpanelmenu.h index fd9c00c..c0ea523 100644 --- a/extra/kde331/kpanelmenu.h +++ b/extra/kde331/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde331/kurifilter.h b/extra/kde331/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde331/kurifilter.h +++ b/extra/kde331/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde331/tdeaccelaction.h b/extra/kde331/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde331/tdeaccelaction.h +++ b/extra/kde331/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde331/tdeaccelbase.h b/extra/kde331/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde331/tdeaccelbase.h +++ b/extra/kde331/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde331/tdetoolbarbutton.h b/extra/kde331/tdetoolbarbutton.h index 724e26b..27936a8 100644 --- a/extra/kde331/tdetoolbarbutton.h +++ b/extra/kde331/tdetoolbarbutton.h @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde332/kkeyserver_x11.h b/extra/kde332/kkeyserver_x11.h index c2e11b7..ad6894c 100644 --- a/extra/kde332/kkeyserver_x11.h +++ b/extra/kde332/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/kde332/kpanelmenu.h b/extra/kde332/kpanelmenu.h index fd9c00c..c0ea523 100644 --- a/extra/kde332/kpanelmenu.h +++ b/extra/kde332/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde332/kurifilter.h b/extra/kde332/kurifilter.h index 325da8f..f0550d1 100644 --- a/extra/kde332/kurifilter.h +++ b/extra/kde332/kurifilter.h @@ -500,17 +500,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde332/tdeaccelaction.h b/extra/kde332/tdeaccelaction.h index 269136c..f84a24d 100644 --- a/extra/kde332/tdeaccelaction.h +++ b/extra/kde332/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde332/tdeaccelbase.h b/extra/kde332/tdeaccelbase.h index ea654cc..296790f 100644 --- a/extra/kde332/tdeaccelbase.h +++ b/extra/kde332/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#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.26 2003/08/16 19:44:57 coolo Exp $ + * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $ */ class TDEAccelBase diff --git a/extra/kde332/tdetoolbarbutton.h b/extra/kde332/tdetoolbarbutton.h index 724e26b..27936a8 100644 --- a/extra/kde332/tdetoolbarbutton.h +++ b/extra/kde332/tdetoolbarbutton.h @@ -303,7 +303,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $ */ class TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde340/kkeyserver_x11.h b/extra/kde340/kkeyserver_x11.h index 0251007..d6c8cb4 100644 --- a/extra/kde340/kkeyserver_x11.h +++ b/extra/kde340/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde340/kpanelmenu.h b/extra/kde340/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde340/kpanelmenu.h +++ b/extra/kde340/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde340/kurifilter.h b/extra/kde340/kurifilter.h index 53dbaa6..1ec8b77 100644 --- a/extra/kde340/kurifilter.h +++ b/extra/kde340/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde340/tdeaccelaction.h b/extra/kde340/tdeaccelaction.h index 963ce24..54a9070 100644 --- a/extra/kde340/tdeaccelaction.h +++ b/extra/kde340/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde340/tdeaccelbase.h b/extra/kde340/tdeaccelbase.h index 00ab632..372735c 100644 --- a/extra/kde340/tdeaccelbase.h +++ b/extra/kde340/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde340/tdetoolbarbutton.h b/extra/kde340/tdetoolbarbutton.h index f035feb..1b35a81 100644 --- a/extra/kde340/tdetoolbarbutton.h +++ b/extra/kde340/tdetoolbarbutton.h @@ -317,7 +317,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde341/kkeyserver_x11.h b/extra/kde341/kkeyserver_x11.h index 0251007..d6c8cb4 100644 --- a/extra/kde341/kkeyserver_x11.h +++ b/extra/kde341/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde341/kpanelmenu.h b/extra/kde341/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde341/kpanelmenu.h +++ b/extra/kde341/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde341/kurifilter.h b/extra/kde341/kurifilter.h index 53dbaa6..1ec8b77 100644 --- a/extra/kde341/kurifilter.h +++ b/extra/kde341/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde341/tdeaccelaction.h b/extra/kde341/tdeaccelaction.h index 963ce24..54a9070 100644 --- a/extra/kde341/tdeaccelaction.h +++ b/extra/kde341/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde341/tdeaccelbase.h b/extra/kde341/tdeaccelbase.h index 00ab632..372735c 100644 --- a/extra/kde341/tdeaccelbase.h +++ b/extra/kde341/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde341/tdetoolbarbutton.h b/extra/kde341/tdetoolbarbutton.h index f035feb..1b35a81 100644 --- a/extra/kde341/tdetoolbarbutton.h +++ b/extra/kde341/tdetoolbarbutton.h @@ -317,7 +317,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ +* @version $Id: tdetoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h index 0dae410..5ae8830 100644 --- a/extra/kde342/kkeyserver_x11.h +++ b/extra/kde342/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde342/kpanelmenu.h b/extra/kde342/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde342/kpanelmenu.h +++ b/extra/kde342/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h index 53dbaa6..1ec8b77 100644 --- a/extra/kde342/kurifilter.h +++ b/extra/kde342/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde342/tdeaccelaction.h b/extra/kde342/tdeaccelaction.h index 963ce24..54a9070 100644 --- a/extra/kde342/tdeaccelaction.h +++ b/extra/kde342/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde342/tdeaccelbase.h b/extra/kde342/tdeaccelbase.h index 00ab632..372735c 100644 --- a/extra/kde342/tdeaccelbase.h +++ b/extra/kde342/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde342/tdetoolbarbutton.h b/extra/kde342/tdetoolbarbutton.h index 91d1291..8da921f 100644 --- a/extra/kde342/tdetoolbarbutton.h +++ b/extra/kde342/tdetoolbarbutton.h @@ -317,7 +317,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ +* @version $Id: tdetoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde343/kkeyserver_x11.h b/extra/kde343/kkeyserver_x11.h index 0dae410..5ae8830 100644 --- a/extra/kde343/kkeyserver_x11.h +++ b/extra/kde343/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde343/kpanelmenu.h b/extra/kde343/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde343/kpanelmenu.h +++ b/extra/kde343/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde343/kurifilter.h b/extra/kde343/kurifilter.h index 53dbaa6..1ec8b77 100644 --- a/extra/kde343/kurifilter.h +++ b/extra/kde343/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde343/tdeaccelaction.h b/extra/kde343/tdeaccelaction.h index 963ce24..54a9070 100644 --- a/extra/kde343/tdeaccelaction.h +++ b/extra/kde343/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde343/tdeaccelbase.h b/extra/kde343/tdeaccelbase.h index 00ab632..372735c 100644 --- a/extra/kde343/tdeaccelbase.h +++ b/extra/kde343/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde343/tdetoolbarbutton.h b/extra/kde343/tdetoolbarbutton.h index 91d1291..8da921f 100644 --- a/extra/kde343/tdetoolbarbutton.h +++ b/extra/kde343/tdetoolbarbutton.h @@ -317,7 +317,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ +* @version $Id: tdetoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde350/kkeyserver_x11.h b/extra/kde350/kkeyserver_x11.h index 2b48047..46268dc 100644 --- a/extra/kde350/kkeyserver_x11.h +++ b/extra/kde350/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde350/kpanelmenu.h b/extra/kde350/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde350/kpanelmenu.h +++ b/extra/kde350/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde350/kurifilter.h b/extra/kde350/kurifilter.h index 639366f..5bfcc92 100644 --- a/extra/kde350/kurifilter.h +++ b/extra/kde350/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde350/tdeaccelaction.h b/extra/kde350/tdeaccelaction.h index 809533f..e8232cc 100644 --- a/extra/kde350/tdeaccelaction.h +++ b/extra/kde350/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde350/tdeaccelbase.h b/extra/kde350/tdeaccelbase.h index e5d832a..920c1c7 100644 --- a/extra/kde350/tdeaccelbase.h +++ b/extra/kde350/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde350/tdetoolbarbutton.h b/extra/kde350/tdetoolbarbutton.h index 1c08569..6d5cd72 100644 --- a/extra/kde350/tdetoolbarbutton.h +++ b/extra/kde350/tdetoolbarbutton.h @@ -318,7 +318,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ +* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde351/kkeyserver_x11.h b/extra/kde351/kkeyserver_x11.h index 2b48047..46268dc 100644 --- a/extra/kde351/kkeyserver_x11.h +++ b/extra/kde351/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde351/kpanelmenu.h b/extra/kde351/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde351/kpanelmenu.h +++ b/extra/kde351/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde351/kurifilter.h b/extra/kde351/kurifilter.h index 639366f..5bfcc92 100644 --- a/extra/kde351/kurifilter.h +++ b/extra/kde351/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde351/tdeaccelaction.h b/extra/kde351/tdeaccelaction.h index 809533f..e8232cc 100644 --- a/extra/kde351/tdeaccelaction.h +++ b/extra/kde351/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde351/tdeaccelbase.h b/extra/kde351/tdeaccelbase.h index e5d832a..920c1c7 100644 --- a/extra/kde351/tdeaccelbase.h +++ b/extra/kde351/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde351/tdetoolbarbutton.h b/extra/kde351/tdetoolbarbutton.h index 1c08569..6d5cd72 100644 --- a/extra/kde351/tdetoolbarbutton.h +++ b/extra/kde351/tdetoolbarbutton.h @@ -318,7 +318,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ +* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde352/kkeyserver_x11.h b/extra/kde352/kkeyserver_x11.h index 2b48047..46268dc 100644 --- a/extra/kde352/kkeyserver_x11.h +++ b/extra/kde352/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde352/kpanelmenu.h b/extra/kde352/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde352/kpanelmenu.h +++ b/extra/kde352/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde352/kurifilter.h b/extra/kde352/kurifilter.h index 639366f..5bfcc92 100644 --- a/extra/kde352/kurifilter.h +++ b/extra/kde352/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde352/tdeaccelaction.h b/extra/kde352/tdeaccelaction.h index 809533f..e8232cc 100644 --- a/extra/kde352/tdeaccelaction.h +++ b/extra/kde352/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde352/tdeaccelbase.h b/extra/kde352/tdeaccelbase.h index e5d832a..920c1c7 100644 --- a/extra/kde352/tdeaccelbase.h +++ b/extra/kde352/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde352/tdetoolbarbutton.h b/extra/kde352/tdetoolbarbutton.h index 1c08569..6d5cd72 100644 --- a/extra/kde352/tdetoolbarbutton.h +++ b/extra/kde352/tdetoolbarbutton.h @@ -318,7 +318,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ +* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/extra/kde353/kkeyserver_x11.h b/extra/kde353/kkeyserver_x11.h index ce3fa2f..9033091 100644 --- a/extra/kde353/kkeyserver_x11.h +++ b/extra/kde353/kkeyserver_x11.h @@ -23,7 +23,7 @@ #ifndef _KKEYSERVER_X11_H #define _KKEYSERVER_X11_H -#include "kshortcut.h" +#include "tdeshortcut.h" #include "kkeynative.h" /** diff --git a/extra/kde353/kpanelmenu.h b/extra/kde353/kpanelmenu.h index 0c03d6f..03b700b 100644 --- a/extra/kde353/kpanelmenu.h +++ b/extra/kde353/kpanelmenu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __KPANELMENU_H__ #include -#include +#include #include class KPanelMenuPrivate; diff --git a/extra/kde353/kurifilter.h b/extra/kde353/kurifilter.h index 639366f..5bfcc92 100644 --- a/extra/kde353/kurifilter.h +++ b/extra/kde353/kurifilter.h @@ -503,17 +503,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/extra/kde353/tdeaccelaction.h b/extra/kde353/tdeaccelaction.h index 809533f..e8232cc 100644 --- a/extra/kde353/tdeaccelaction.h +++ b/extra/kde353/tdeaccelaction.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TDEAccelBase; diff --git a/extra/kde353/tdeaccelbase.h b/extra/kde353/tdeaccelbase.h index e5d832a..920c1c7 100644 --- a/extra/kde353/tdeaccelbase.h +++ b/extra/kde353/tdeaccelbase.h @@ -26,7 +26,7 @@ #include #include -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include "kkeyserver.h" class TQPopupMenu; diff --git a/extra/kde353/tdetoolbarbutton.h b/extra/kde353/tdetoolbarbutton.h index 1c08569..6d5cd72 100644 --- a/extra/kde353/tdetoolbarbutton.h +++ b/extra/kde353/tdetoolbarbutton.h @@ -318,7 +318,7 @@ private: /** * List of TDEToolBarButton objects. * @internal -* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ +* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict { diff --git a/pytde350.prj b/pytde350.prj index 3f8291a..74b7bab 100644 --- a/pytde350.prj +++ b/pytde350.prj @@ -68,7 +68,7 @@ source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h ignore = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h -ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h +ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h tdeaccelmanager.h ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h ignore = kswap.h compare = $COMP $DST/extra/kde350 @@ -80,7 +80,7 @@ include = libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = pObjSlot psMethodSlot kaccel kglobalaccel +sipslot = pObjSlot psMethodSlot tdeaccel kglobalaccel define = "Q_WS_X11", "1" define = "\(TQt::ALT \<\< 1\)", "16777216" define = "\(TQt::META\)", "16777216" @@ -138,11 +138,11 @@ retain module = tdeui -//trace = kactioncollection.sip +//trace = tdeactioncollection.sip source = $SRC/tdeui/ -ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h -ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h +ignore = kcolorbutton.h kcolordlg.h kwidgetid.h tdeaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h +ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h tdelistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h compare = $COMP subst = $DST/extra/kde350 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) @@ -158,8 +158,8 @@ amend = * ctor parent /TransferThis/ amend = KDockMainWindow all parent /TransferThis/ amend = KDockArea all parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = receiver member kaccelmenu -sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar +sipslot = receiver member tdeaccelmenu +sipslot = receiver slot tdeaction tdeactionclasses kbuttonbox tdetoolbar sipslot = recvr slot kstdaction define = "TQT_VERSION", "301" define = "TDEUI_EXPORT", "" diff --git a/pytde351.prj b/pytde351.prj index 357746b..a2e9186 100644 --- a/pytde351.prj +++ b/pytde351.prj @@ -68,7 +68,7 @@ source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h ignore = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h -ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h +ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h tdeaccelmanager.h ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h ignore = kswap.h compare = $COMP $DST/extra/kde351 @@ -80,7 +80,7 @@ include = libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = pObjSlot psMethodSlot kaccel kglobalaccel +sipslot = pObjSlot psMethodSlot tdeaccel kglobalaccel define = "Q_WS_X11", "1" define = "\(TQt::ALT \<\< 1\)", "16777216" define = "\(TQt::META\)", "16777216" @@ -138,11 +138,11 @@ retain module = tdeui -//trace = kactioncollection.sip +//trace = tdeactioncollection.sip source = $SRC/tdeui/ -ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h -ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h +ignore = kcolorbutton.h kcolordlg.h kwidgetid.h tdeaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h +ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h tdelistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h compare = $COMP subst = $DST/extra/kde351 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) @@ -158,8 +158,8 @@ amend = * ctor parent /TransferThis/ amend = KDockMainWindow all parent /TransferThis/ amend = KDockArea all parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = receiver member kaccelmenu -sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar +sipslot = receiver member tdeaccelmenu +sipslot = receiver slot tdeaction tdeactionclasses kbuttonbox tdetoolbar sipslot = recvr slot kstdaction define = "TQT_VERSION", "301" define = "TDEUI_EXPORT", "" diff --git a/pytde352.prj b/pytde352.prj index e1b8181..8622f57 100644 --- a/pytde352.prj +++ b/pytde352.prj @@ -68,7 +68,7 @@ source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h ignore = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h -ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h +ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h tdeaccelmanager.h ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h ignore = kswap.h compare = $COMP $DST/extra/kde352 @@ -80,7 +80,7 @@ include = libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = pObjSlot psMethodSlot kaccel kglobalaccel +sipslot = pObjSlot psMethodSlot tdeaccel kglobalaccel define = "Q_WS_X11", "1" define = "\(TQt::ALT \<\< 1\)", "16777216" define = "\(TQt::META\)", "16777216" @@ -138,11 +138,11 @@ retain module = tdeui -//trace = kactioncollection.sip +//trace = tdeactioncollection.sip source = $SRC/tdeui/ -ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h -ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h +ignore = kcolorbutton.h kcolordlg.h kwidgetid.h tdeaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h +ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h tdelistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h compare = $COMP subst = $DST/extra/kde352 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) @@ -158,8 +158,8 @@ amend = * ctor parent /TransferThis/ amend = KDockMainWindow all parent /TransferThis/ amend = KDockArea all parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = receiver member kaccelmenu -sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar +sipslot = receiver member tdeaccelmenu +sipslot = receiver slot tdeaction tdeactionclasses kbuttonbox tdetoolbar sipslot = recvr slot kstdaction define = "TQT_VERSION", "301" define = "TDEUI_EXPORT", "" diff --git a/pytde353.prj b/pytde353.prj index 515f35e..fb71d4d 100644 --- a/pytde353.prj +++ b/pytde353.prj @@ -68,7 +68,7 @@ source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h ignore = tdesycocaentry.h tdesycocafactory.h tdesycocatype.h tdesycoca.h kapp.h kstandarddirs.h ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h -ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h +ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h tdeaccelmanager.h ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h ignore = kswap.h compare = $COMP $DST/extra/kde353 @@ -80,7 +80,7 @@ include = libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = pObjSlot psMethodSlot kaccel kglobalaccel +sipslot = pObjSlot psMethodSlot tdeaccel kglobalaccel define = "Q_WS_X11", "1" define = "\(TQt::ALT \<\< 1\)", "16777216" define = "\(TQt::META\)", "16777216" @@ -138,11 +138,11 @@ retain module = tdeui -//trace = kactioncollection.sip +//trace = tdeactioncollection.sip source = $SRC/tdeui/ -ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h -ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h +ignore = kcolorbutton.h kcolordlg.h kwidgetid.h tdeaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h +ignore = kdockwindow.h ksconfig.h tdespell.h tdespelldlg.h tdelistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h compare = $COMP subst = $DST/extra/kde353 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) @@ -158,8 +158,8 @@ amend = * ctor parent /TransferThis/ amend = KDockMainWindow all parent /TransferThis/ amend = KDockArea all parent /TransferThis/ amend = * all parent /Transfer/ -sipslot = receiver member kaccelmenu -sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar +sipslot = receiver member tdeaccelmenu +sipslot = receiver slot tdeaction tdeactionclasses kbuttonbox tdetoolbar sipslot = recvr slot kstdaction define = "TQT_VERSION", "301" define = "TDEUI_EXPORT", "" diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip index dfce48f..7522118 100644 --- a/sip/tdecore/tdeaccel.sip +++ b/sip/tdecore/tdeaccel.sip @@ -27,7 +27,7 @@ class TDEAccel : TQAccel { %TypeHeaderCode -#include +#include %End @@ -161,7 +161,7 @@ public: //converts a Python dict of int:TQString { %TypeHeaderCode -#include +#include %End %ConvertFromTypeCode diff --git a/sip/tdecore/tdeaccelaction.sip b/sip/tdecore/tdeaccelaction.sip index 22e14ed..dff7dc4 100644 --- a/sip/tdecore/tdeaccelaction.sip +++ b/sip/tdecore/tdeaccelaction.sip @@ -27,7 +27,7 @@ class TDEAccelAction { %TypeHeaderCode -#include +#include %End @@ -76,7 +76,7 @@ protected: class TDEAccelActions { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdecore/tdeaccelbase.sip b/sip/tdecore/tdeaccelbase.sip index 20139e5..ba8205a 100644 --- a/sip/tdecore/tdeaccelbase.sip +++ b/sip/tdecore/tdeaccelbase.sip @@ -27,7 +27,7 @@ class TDEAccelBase { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in index 28b89d6..09aeacb 100644 --- a/sip/tdecore/tdecoremod.sip.in +++ b/sip/tdecore/tdecoremod.sip.in @@ -33,9 +33,9 @@ %Include bytearray.sip %Include kaboutdata.sip -%Include kaccel.sip -%Include kaccelaction.sip -%Include kaccelbase.sip +%Include tdeaccel.sip +%Include tdeaccelaction.sip +%Include tdeaccelbase.sip %Include kallocator.sip %Include kapplication.sip %Include kasyncio.sip @@ -79,13 +79,13 @@ %Include krootprop.sip %Include ksavefile.sip %Include ksharedptr.sip -%Include kshortcut.sip -%Include kshortcutlist.sip +%Include tdeshortcut.sip +%Include tdeshortcutlist.sip %Include ksimpleconfig.sip %Include ksock.sip %Include kstartupinfo.sip %Include kstaticdeleter.sip -%Include kstdaccel.sip +%Include tdestdaccel.sip %Include kstddirs.sip %Include kstringhandler.sip %Include ktempdir.sip diff --git a/sip/tdecore/tdeshortcut.sip b/sip/tdecore/tdeshortcut.sip index 4eb2d03..14b859b 100644 --- a/sip/tdecore/tdeshortcut.sip +++ b/sip/tdecore/tdeshortcut.sip @@ -27,7 +27,7 @@ class KKey { %TypeHeaderCode -#include +#include %End @@ -127,7 +127,7 @@ public: class KKeySequence { %TypeHeaderCode -#include +#include %End @@ -185,7 +185,7 @@ public: class TDEShortcut { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdecore/tdeshortcutlist.sip b/sip/tdecore/tdeshortcutlist.sip index b1fb9bd..a87a122 100644 --- a/sip/tdecore/tdeshortcutlist.sip +++ b/sip/tdecore/tdeshortcutlist.sip @@ -28,8 +28,8 @@ class TDEShortcutList { %TypeHeaderCode #include -#include -#include +#include +#include %End @@ -69,8 +69,8 @@ class TDEAccelShortcutList : TDEShortcutList { %TypeHeaderCode #include -#include -#include +#include +#include %End @@ -105,8 +105,8 @@ class ShortcutList : TDEShortcutList { %TypeHeaderCode #include -#include -#include +#include +#include %End diff --git a/sip/tdecore/tdestdaccel.sip b/sip/tdecore/tdestdaccel.sip index 2af5526..05ccb2c 100644 --- a/sip/tdecore/tdestdaccel.sip +++ b/sip/tdecore/tdestdaccel.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %ModuleHeaderCode -#include +#include %End namespace TDEStdAccel diff --git a/sip/tdefile/tdefile-kde352.diff b/sip/tdefile/tdefile-kde352.diff index 9083bb6..46a59e2 100644 --- a/sip/tdefile/tdefile-kde352.diff +++ b/sip/tdefile/tdefile-kde352.diff @@ -1,4 +1,4 @@ -- %Include krecentdirs.sip +- %Include tderecentdirs.sip + %Include kcustommenueditor.sip + %Include kdiskfreesp.sip + %Include kencodingfiledialog.sip diff --git a/sip/tdefile/tdefilemod.sip.in b/sip/tdefile/tdefilemod.sip.in index 7246ceb..1d8bb5d 100644 --- a/sip/tdefile/tdefilemod.sip.in +++ b/sip/tdefile/tdefilemod.sip.in @@ -55,7 +55,7 @@ %Include kopenwith.sip %Include kpreviewwidgetbase.sip %Include kpropertiesdialog.sip -%Include krecentdocument.sip +%Include tderecentdocument.sip %Include kurlbar.sip %Include kurlcombobox.sip %Include kurlrequester.sip diff --git a/sip/tdefile/tderecentdirs.sip b/sip/tdefile/tderecentdirs.sip index 3022abd..a4b7d43 100644 --- a/sip/tdefile/tderecentdirs.sip +++ b/sip/tdefile/tderecentdirs.sip @@ -27,7 +27,7 @@ class TDERecentDirs { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdefile/tderecentdocument.sip b/sip/tdefile/tderecentdocument.sip index b8d1169..cff6825 100644 --- a/sip/tdefile/tderecentdocument.sip +++ b/sip/tdefile/tderecentdocument.sip @@ -27,7 +27,7 @@ class TDERecentDocument { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeparts/doctdemainwindow.sip b/sip/tdeparts/dockmainwindow.sip similarity index 100% rename from sip/tdeparts/doctdemainwindow.sip rename to sip/tdeparts/dockmainwindow.sip diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip index af2cd5b..e62e82c 100644 --- a/sip/tdeui/kxmlguifactory.sip +++ b/sip/tdeui/kxmlguifactory.sip @@ -88,7 +88,7 @@ TQPtrList testTDEActionList (TQPtrList); { %TypeHeaderCode #include -#include +#include %End %ConvertFromTypeCode diff --git a/sip/tdeui/tdeaccelmanager.sip b/sip/tdeui/tdeaccelmanager.sip index 183f3d9..775226c 100644 --- a/sip/tdeui/tdeaccelmanager.sip +++ b/sip/tdeui/tdeaccelmanager.sip @@ -29,7 +29,7 @@ class TDEAcceleratorManager { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeaccelmenu.sip b/sip/tdeui/tdeaccelmenu.sip index 6477619..ccacf51 100644 --- a/sip/tdeui/tdeaccelmenu.sip +++ b/sip/tdeui/tdeaccelmenu.sip @@ -27,9 +27,9 @@ class TDEAccelMenu : TDEPopupMenu { %TypeHeaderCode -#include -#include -#include +#include +#include +#include %End diff --git a/sip/tdeui/tdeaction.sip b/sip/tdeui/tdeaction.sip index ff1d452..f0596bf 100644 --- a/sip/tdeui/tdeaction.sip +++ b/sip/tdeui/tdeaction.sip @@ -27,7 +27,7 @@ class TDEAction : TQObject { %TypeHeaderCode -#include +#include %End @@ -61,7 +61,7 @@ public: int containerCount () const; %If ( KDE_3_1_0 - ) - uint kaccelCount () const; + uint tdeaccelCount () const; %End virtual bool hasIcon () const; @@ -186,7 +186,7 @@ protected: class TDEToggleAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -228,7 +228,7 @@ protected: class TDERadioAction : TDEToggleAction { %TypeHeaderCode -#include +#include %End @@ -257,7 +257,7 @@ protected: class TDESelectAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -329,7 +329,7 @@ protected: class TDEListAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -360,7 +360,7 @@ protected: class TDERecentFilesAction : TDEListAction { %TypeHeaderCode -#include +#include %End @@ -403,7 +403,7 @@ protected: class TDEFontAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -434,7 +434,7 @@ protected: class TDEFontSizeAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -472,7 +472,7 @@ protected: class TDEActionMenu : TDEAction { %TypeHeaderCode -#include +#include %End @@ -504,7 +504,7 @@ protected: class TDEToolBarPopupAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -532,7 +532,7 @@ protected: class TDEToggleToolBarAction : TDEToggleAction { %TypeHeaderCode -#include +#include %End @@ -558,7 +558,7 @@ protected: class KWidgetAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -585,7 +585,7 @@ protected: class TDEActionSeparator : TDEAction { %TypeHeaderCode -#include +#include %End @@ -606,7 +606,7 @@ protected: class TDEActionCollection : TQObject { %TypeHeaderCode -#include +#include %End @@ -625,7 +625,7 @@ public: virtual TDEAccel* accel (); %If ( KDE_3_1_0 - ) - TDEAccel* kaccel (); + TDEAccel* tdeaccel (); TDEAccel* builderTDEAccel () const; %End @@ -692,7 +692,7 @@ protected: { %TypeHeaderCode #include -#include +#include //typedef TQValueList TDEActionPtrList; %End diff --git a/sip/tdeui/tdeactionclasses.sip b/sip/tdeui/tdeactionclasses.sip index 63cc6d6..f566ecd 100644 --- a/sip/tdeui/tdeactionclasses.sip +++ b/sip/tdeui/tdeactionclasses.sip @@ -29,7 +29,7 @@ class TDEToggleAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -77,7 +77,7 @@ protected: class TDERadioAction : TDEToggleAction { %TypeHeaderCode -#include +#include %End @@ -106,7 +106,7 @@ protected: class TDESelectAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -180,7 +180,7 @@ protected: class TDEListAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -211,7 +211,7 @@ protected: class TDERecentFilesAction : TDEListAction { %TypeHeaderCode -#include +#include %End @@ -270,7 +270,7 @@ protected: class TDEFontAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -307,7 +307,7 @@ protected: class TDEFontSizeAction : TDESelectAction { %TypeHeaderCode -#include +#include %End @@ -345,7 +345,7 @@ protected: class TDEActionMenu : TDEAction { %TypeHeaderCode -#include +#include %End @@ -377,7 +377,7 @@ protected: class TDEToolBarPopupAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -405,7 +405,7 @@ protected: class TDEToggleToolBarAction : TDEToggleAction { %TypeHeaderCode -#include +#include %End @@ -431,7 +431,7 @@ protected: class TDEToggleFullScreenAction : TDEToggleAction { %TypeHeaderCode -#include +#include %End @@ -458,7 +458,7 @@ protected: class KWidgetAction : TDEAction { %TypeHeaderCode -#include +#include %End @@ -485,7 +485,7 @@ protected: class TDEActionSeparator : TDEAction { %TypeHeaderCode -#include +#include %End @@ -506,7 +506,7 @@ protected: class TDEPasteTextAction : TDEAction { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeactioncollection.sip b/sip/tdeui/tdeactioncollection.sip index c696bdd..2ba234b 100644 --- a/sip/tdeui/tdeactioncollection.sip +++ b/sip/tdeui/tdeactioncollection.sip @@ -29,7 +29,7 @@ class TDEActionCollection : TQObject { %TypeHeaderCode -#include +#include %End @@ -42,7 +42,7 @@ public: bool isAutoConnectShortcuts (); bool addDocCollection (TDEActionCollection*); virtual TDEAccel* accel (); - TDEAccel* kaccel (); + TDEAccel* tdeaccel (); TDEAccel* builderTDEAccel () const; virtual uint count () const; bool isEmpty () const; diff --git a/sip/tdeui/tdeactionselector.sip b/sip/tdeui/tdeactionselector.sip index 717c2d3..4903126 100644 --- a/sip/tdeui/tdeactionselector.sip +++ b/sip/tdeui/tdeactionselector.sip @@ -29,7 +29,7 @@ class TDEActionSelector : TQWidget { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeactionshortcutlist.sip b/sip/tdeui/tdeactionshortcutlist.sip index bd45aea..9ef6444 100644 --- a/sip/tdeui/tdeactionshortcutlist.sip +++ b/sip/tdeui/tdeactionshortcutlist.sip @@ -28,9 +28,9 @@ class TDEActionShortcutList : TDEShortcutList { %TypeHeaderCode #include -#include -#include -#include +#include +#include +#include %End @@ -66,9 +66,9 @@ class TDEActionPtrShortcutList : TDEShortcutList { %TypeHeaderCode #include -#include -#include -#include +#include +#include +#include %End diff --git a/sip/tdeui/tdefontcombo.sip b/sip/tdeui/tdefontcombo.sip index 96d2865..a3e7596 100644 --- a/sip/tdeui/tdefontcombo.sip +++ b/sip/tdeui/tdefontcombo.sip @@ -27,7 +27,7 @@ class TDEFontCombo : KComboBox { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdefontdialog.sip b/sip/tdeui/tdefontdialog.sip index 3fc4cb2..9d442d7 100644 --- a/sip/tdeui/tdefontdialog.sip +++ b/sip/tdeui/tdefontdialog.sip @@ -28,7 +28,7 @@ class TDEFontChooser : TQWidget { %TypeHeaderCode #include -#include +#include %End @@ -118,7 +118,7 @@ public: class TDEFontDialog : KDialogBase { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdefontrequester.sip b/sip/tdeui/tdefontrequester.sip index 9d84461..4537998 100644 --- a/sip/tdeui/tdefontrequester.sip +++ b/sip/tdeui/tdefontrequester.sip @@ -29,7 +29,7 @@ class TDEFontRequester : TQWidget { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdelistbox.sip b/sip/tdeui/tdelistbox.sip index 9c2c1c1..97d25e6 100644 --- a/sip/tdeui/tdelistbox.sip +++ b/sip/tdeui/tdelistbox.sip @@ -27,7 +27,7 @@ class TDEListBox : TQListBox { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdelistview.sip b/sip/tdeui/tdelistview.sip index 2af44b2..1a59997 100644 --- a/sip/tdeui/tdelistview.sip +++ b/sip/tdeui/tdelistview.sip @@ -27,7 +27,7 @@ class TDEListView : TQListView { %TypeHeaderCode -#include +#include %End @@ -230,7 +230,7 @@ protected: class TDEListViewItem : TQListViewItem { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdelistviewlineedit.sip b/sip/tdeui/tdelistviewlineedit.sip index c5125f0..ef57558 100644 --- a/sip/tdeui/tdelistviewlineedit.sip +++ b/sip/tdeui/tdelistviewlineedit.sip @@ -27,7 +27,7 @@ class TDEListViewLineEdit : KLineEdit { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdelistviewsearchline.sip b/sip/tdeui/tdelistviewsearchline.sip index 4c73477..495f26f 100644 --- a/sip/tdeui/tdelistviewsearchline.sip +++ b/sip/tdeui/tdelistviewsearchline.sip @@ -29,7 +29,7 @@ class TDEListViewSearchLine : KLineEdit { %TypeHeaderCode -#include +#include %End @@ -66,7 +66,7 @@ protected slots: class TDEListViewSearchLineWidget : TQHBox { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdemainwindow.sip b/sip/tdeui/tdemainwindow.sip index b056361..ea9635a 100644 --- a/sip/tdeui/tdemainwindow.sip +++ b/sip/tdeui/tdemainwindow.sip @@ -27,7 +27,7 @@ class TDEMainWindow : TQMainWindow, KXMLGUIBuilder, KXMLGUIClient { %TypeHeaderCode -#include +#include %End @@ -205,7 +205,7 @@ protected: { %TypeHeaderCode #include -#include +#include %End %ConvertFromTypeCode diff --git a/sip/tdeui/tdemainwindowiface.sip b/sip/tdeui/tdemainwindowiface.sip index d872a0a..5f6d8b4 100644 --- a/sip/tdeui/tdemainwindowiface.sip +++ b/sip/tdeui/tdemainwindowiface.sip @@ -27,7 +27,7 @@ class TDEMainWindowInterface : DCOPObject { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdepopupmenu.sip b/sip/tdeui/tdepopupmenu.sip index a4b523a..c7fc8f8 100644 --- a/sip/tdeui/tdepopupmenu.sip +++ b/sip/tdeui/tdepopupmenu.sip @@ -27,7 +27,7 @@ class TDEPopupTitle : TQWidget { %TypeHeaderCode -#include +#include %End @@ -65,7 +65,7 @@ protected: class TDEPopupMenu : TQPopupMenu { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeselect.sip b/sip/tdeui/tdeselect.sip index 7c88d8c..422575d 100644 --- a/sip/tdeui/tdeselect.sip +++ b/sip/tdeui/tdeselect.sip @@ -27,7 +27,7 @@ class KXYSelector : TQWidget { %TypeHeaderCode -#include +#include %End @@ -70,7 +70,7 @@ protected: class TDESelector : TQWidget, TQRangeControl { %TypeHeaderCode -#include +#include %End @@ -113,7 +113,7 @@ protected: class KGradientSelector : TDESelector { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeshortcutdialog.sip b/sip/tdeui/tdeshortcutdialog.sip index eb0d9c8..4a17ece 100644 --- a/sip/tdeui/tdeshortcutdialog.sip +++ b/sip/tdeui/tdeshortcutdialog.sip @@ -29,7 +29,7 @@ class TDEShortcutDialog : KDialogBase { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdetoolbar.sip b/sip/tdeui/tdetoolbar.sip index 5317080..3f8878f 100644 --- a/sip/tdeui/tdetoolbar.sip +++ b/sip/tdeui/tdetoolbar.sip @@ -27,7 +27,7 @@ class TDEToolBarSeparator : TQFrame { %TypeHeaderCode -#include +#include %End @@ -55,7 +55,7 @@ protected: class TDEToolBar : TQToolBar { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdetoolbarbutton.sip b/sip/tdeui/tdetoolbarbutton.sip index cb78fa7..ca8460c 100644 --- a/sip/tdeui/tdetoolbarbutton.sip +++ b/sip/tdeui/tdetoolbarbutton.sip @@ -27,7 +27,7 @@ class TDEToolBarButton : TQToolButton { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdetoolbarlabelaction.sip b/sip/tdeui/tdetoolbarlabelaction.sip index d3f06e8..e457c11 100644 --- a/sip/tdeui/tdetoolbarlabelaction.sip +++ b/sip/tdeui/tdetoolbarlabelaction.sip @@ -29,7 +29,7 @@ class TDEToolBarLabelAction : KWidgetAction { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdetoolbarradiogroup.sip b/sip/tdeui/tdetoolbarradiogroup.sip index e6240e1..3dedf72 100644 --- a/sip/tdeui/tdetoolbarradiogroup.sip +++ b/sip/tdeui/tdetoolbarradiogroup.sip @@ -27,7 +27,7 @@ class TDEToolBarRadioGroup : TQObject { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeui-kde310.diff b/sip/tdeui/tdeui-kde310.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde310.diff +++ b/sip/tdeui/tdeui-kde310.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde311.diff b/sip/tdeui/tdeui-kde311.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde311.diff +++ b/sip/tdeui/tdeui-kde311.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde312.diff b/sip/tdeui/tdeui-kde312.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde312.diff +++ b/sip/tdeui/tdeui-kde312.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde313.diff b/sip/tdeui/tdeui-kde313.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde313.diff +++ b/sip/tdeui/tdeui-kde313.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde314.diff b/sip/tdeui/tdeui-kde314.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde314.diff +++ b/sip/tdeui/tdeui-kde314.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde315.diff b/sip/tdeui/tdeui-kde315.diff index c12c183..c0e5386 100644 --- a/sip/tdeui/tdeui-kde315.diff +++ b/sip/tdeui/tdeui-kde315.diff @@ -1,4 +1,4 @@ -+ %Include kaccelmanager.sip ++ %Include tdeaccelmanager.sip + %Include kpassivepopup.sip + %Include ktextedit.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde320.diff b/sip/tdeui/tdeui-kde320.diff index f1c0755..2054327 100644 --- a/sip/tdeui/tdeui-kde320.diff +++ b/sip/tdeui/tdeui-kde320.diff @@ -1,8 +1,8 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip diff --git a/sip/tdeui/tdeui-kde321.diff b/sip/tdeui/tdeui-kde321.diff index f1c0755..2054327 100644 --- a/sip/tdeui/tdeui-kde321.diff +++ b/sip/tdeui/tdeui-kde321.diff @@ -1,8 +1,8 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip diff --git a/sip/tdeui/tdeui-kde322.diff b/sip/tdeui/tdeui-kde322.diff index f1c0755..2054327 100644 --- a/sip/tdeui/tdeui-kde322.diff +++ b/sip/tdeui/tdeui-kde322.diff @@ -1,8 +1,8 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip diff --git a/sip/tdeui/tdeui-kde323.diff b/sip/tdeui/tdeui-kde323.diff index 18841bb..c95dd6c 100644 --- a/sip/tdeui/tdeui-kde323.diff +++ b/sip/tdeui/tdeui-kde323.diff @@ -1,8 +1,8 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include kpassivepopup.sip //+ %Include ksharedpixmap.sip diff --git a/sip/tdeui/tdeui-kde330.diff b/sip/tdeui/tdeui-kde330.diff index 0e78196..7c97cf8 100644 --- a/sip/tdeui/tdeui-kde330.diff +++ b/sip/tdeui/tdeui-kde330.diff @@ -1,12 +1,12 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip + %Include ktabbar.sip diff --git a/sip/tdeui/tdeui-kde331.diff b/sip/tdeui/tdeui-kde331.diff index 0e78196..7c97cf8 100644 --- a/sip/tdeui/tdeui-kde331.diff +++ b/sip/tdeui/tdeui-kde331.diff @@ -1,12 +1,12 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip + %Include ktabbar.sip diff --git a/sip/tdeui/tdeui-kde332.diff b/sip/tdeui/tdeui-kde332.diff index 0e78196..7c97cf8 100644 --- a/sip/tdeui/tdeui-kde332.diff +++ b/sip/tdeui/tdeui-kde332.diff @@ -1,12 +1,12 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include ksplashscreen.sip + %Include ktabbar.sip diff --git a/sip/tdeui/tdeui-kde340.diff b/sip/tdeui/tdeui-kde340.diff index a59386a..1b1377a 100644 --- a/sip/tdeui/tdeui-kde340.diff +++ b/sip/tdeui/tdeui-kde340.diff @@ -1,21 +1,21 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde341.diff b/sip/tdeui/tdeui-kde341.diff index a59386a..1b1377a 100644 --- a/sip/tdeui/tdeui-kde341.diff +++ b/sip/tdeui/tdeui-kde341.diff @@ -1,21 +1,21 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde342.diff b/sip/tdeui/tdeui-kde342.diff index a59386a..1b1377a 100644 --- a/sip/tdeui/tdeui-kde342.diff +++ b/sip/tdeui/tdeui-kde342.diff @@ -1,21 +1,21 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde343.diff b/sip/tdeui/tdeui-kde343.diff index a59386a..1b1377a 100644 --- a/sip/tdeui/tdeui-kde343.diff +++ b/sip/tdeui/tdeui-kde343.diff @@ -1,21 +1,21 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde350.diff b/sip/tdeui/tdeui-kde350.diff index b78a05a..8784d8d 100644 --- a/sip/tdeui/tdeui-kde350.diff +++ b/sip/tdeui/tdeui-kde350.diff @@ -1,23 +1,23 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip + %Include kscrollview.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip + %Include ktimezonewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde351.diff b/sip/tdeui/tdeui-kde351.diff index b78a05a..8784d8d 100644 --- a/sip/tdeui/tdeui-kde351.diff +++ b/sip/tdeui/tdeui-kde351.diff @@ -1,23 +1,23 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip + %Include kscrollview.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip + %Include ktimezonewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde352.diff b/sip/tdeui/tdeui-kde352.diff index b78a05a..8784d8d 100644 --- a/sip/tdeui/tdeui-kde352.diff +++ b/sip/tdeui/tdeui-kde352.diff @@ -1,23 +1,23 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip + %Include kscrollview.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip + %Include ktimezonewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeui-kde353.diff b/sip/tdeui/tdeui-kde353.diff index b78a05a..8784d8d 100644 --- a/sip/tdeui/tdeui-kde353.diff +++ b/sip/tdeui/tdeui-kde353.diff @@ -1,23 +1,23 @@ -+ %Include kactionclasses.sip -+ %Include kactioncollection.sip -+ %Include kactionselector.sip ++ %Include tdeactionclasses.sip ++ %Include tdeactioncollection.sip ++ %Include tdeactionselector.sip + %Include tdeconfigdialog.sip + %Include kdatetimewidget.sip -+ %Include kfontrequester.sip ++ %Include tdefontrequester.sip + %Include kiconviewsearchline.sip + %Include kinputdialog.sip + %Include klanguagebutton.sip -+ %Include klistviewsearchline.sip ++ %Include tdelistviewsearchline.sip + %Include kpassivepopup.sip + %Include kpixmapregionselectordialog.sip + %Include kpixmapregionselectorwidget.sip + %Include kscrollview.sip -+ %Include kshortcutdialog.sip ++ %Include tdeshortcutdialog.sip + %Include ksplashscreen.sip + %Include ktabbar.sip + %Include ktabwidget.sip + %Include ktextedit.sip + %Include ktimewidget.sip + %Include ktimezonewidget.sip -+ %Include ktoolbarlabelaction.sip ++ %Include tdetoolbarlabelaction.sip + %Include twindowinfo.sip diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in index c9101c8..8002a8c 100644 --- a/sip/tdeui/tdeuimod.sip.in +++ b/sip/tdeui/tdeuimod.sip.in @@ -37,8 +37,8 @@ %Include kaboutapplication.sip %Include kaboutdialog.sip %Include kaboutkde.sip -%Include kaction.sip -%Include kactionshortcutlist.sip +%Include tdeaction.sip +%Include tdeactionshortcutlist.sip %Include kactivelabel.sip %Include kanimwidget.sip %Include karrowbutton.sip @@ -67,8 +67,8 @@ %Include keditcl.sip %Include keditlistbox.sip %Include kedittoolbar.sip -%Include kfontcombo.sip -%Include kfontdialog.sip +%Include tdefontcombo.sip +%Include tdefontdialog.sip %Include kguiitem.sip %Include khelpmenu.sip %Include kiconview.sip @@ -78,10 +78,10 @@ %Include kled.sip %Include klineedit.sip %Include klineeditdlg.sip -%Include klistbox.sip -%Include klistview.sip -%Include kmainwindow.sip -%Include kmainwindowiface.sip +%Include tdelistbox.sip +%Include tdelistview.sip +%Include tdemainwindow.sip +%Include tdemainwindowiface.sip %Include kmenubar.sip %Include kmessagebox.sip %Include knuminput.sip @@ -92,13 +92,13 @@ %Include kpanelmenu.sip %Include kpassdlg.sip %Include kpixmapio.sip -%Include kpopupmenu.sip +%Include tdepopupmenu.sip %Include kprogress.sip %Include kpushbutton.sip %Include krestrictedline.sip %Include krootpixmap.sip %Include kruler.sip -%Include kselect.sip +%Include tdeselect.sip %Include kseparator.sip %Include ksqueezedtextlabel.sip %Include kstatusbar.sip @@ -109,9 +109,9 @@ %Include ktabctl.sip %Include ktextbrowser.sip %Include ktip.sip -%Include ktoolbar.sip -%Include ktoolbarbutton.sip -%Include ktoolbarradiogroup.sip +%Include tdetoolbar.sip +%Include tdetoolbarbutton.sip +%Include tdetoolbarradiogroup.sip %Include kurllabel.sip %Include twindowlistmenu.sip %Include kwizard.sip