From ccad7a42d96879251c4971e51aac269f61a0ccf8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 16:21:06 -0600 Subject: [PATCH] Fix FTBFS resulting from KCModule rename --- pytde350.prj | 2 +- pytde351.prj | 2 +- pytde352.prj | 2 +- pytde353.prj | 2 +- sip/kutils/kutils-kde340.diff | 2 +- sip/kutils/kutils-kde341.diff | 2 +- sip/kutils/kutilsmod.sip.in | 6 +++--- sip/kutils/{kcmoduleinfo.sip => tdecmoduleinfo.sip} | 2 +- sip/kutils/{kcmoduleloader.sip => tdecmoduleloader.sip} | 2 +- sip/kutils/{kcmoduleproxy.sip => tdecmoduleproxy.sip} | 2 +- sip/tdeui/{kcmodule.sip => tdecmodule.sip} | 2 +- sip/tdeui/tdeuimod.sip.in | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename sip/kutils/{kcmoduleinfo.sip => tdecmoduleinfo.sip} (99%) rename sip/kutils/{kcmoduleloader.sip => tdecmoduleloader.sip} (98%) rename sip/kutils/{kcmoduleproxy.sip => tdecmoduleproxy.sip} (98%) rename sip/tdeui/{kcmodule.sip => tdecmodule.sip} (99%) diff --git a/pytde350.prj b/pytde350.prj index 14817b6..8ebd589 100644 --- a/pytde350.prj +++ b/pytde350.prj @@ -249,7 +249,7 @@ source = $SRC/kutils/ ignore = compare = $COMP subst = $DST/extra/kde350 -ignore = kcmodulecontainer.h +ignore = tdecmodulecontainer.h import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) import = dcopmod.sip import = tdecoremod.sip diff --git a/pytde351.prj b/pytde351.prj index 986a9b0..ce1c3cb 100644 --- a/pytde351.prj +++ b/pytde351.prj @@ -249,7 +249,7 @@ source = $SRC/kutils/ ignore = compare = $COMP subst = $DST/extra/kde351 -ignore = kcmodulecontainer.h +ignore = tdecmodulecontainer.h import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) import = dcopmod.sip import = tdecoremod.sip diff --git a/pytde352.prj b/pytde352.prj index 9dede85..f32ee60 100644 --- a/pytde352.prj +++ b/pytde352.prj @@ -249,7 +249,7 @@ source = $SRC/kutils/ ignore = compare = $COMP subst = $DST/extra/kde352 -ignore = kcmodulecontainer.h +ignore = tdecmodulecontainer.h import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) import = dcopmod.sip import = tdecoremod.sip diff --git a/pytde353.prj b/pytde353.prj index abee761..dd75fdb 100644 --- a/pytde353.prj +++ b/pytde353.prj @@ -249,7 +249,7 @@ source = $SRC/kutils/ ignore = compare = $COMP subst = $DST/extra/kde353 -ignore = kcmodulecontainer.h +ignore = tdecmodulecontainer.h import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) import = dcopmod.sip import = tdecoremod.sip diff --git a/sip/kutils/kutils-kde340.diff b/sip/kutils/kutils-kde340.diff index d37bf3d..0805f47 100644 --- a/sip/kutils/kutils-kde340.diff +++ b/sip/kutils/kutils-kde340.diff @@ -1 +1 @@ -+ %Include kcmodulecontainer.sip ++ %Include tdecmodulecontainer.sip diff --git a/sip/kutils/kutils-kde341.diff b/sip/kutils/kutils-kde341.diff index d37bf3d..0805f47 100644 --- a/sip/kutils/kutils-kde341.diff +++ b/sip/kutils/kutils-kde341.diff @@ -1 +1 @@ -+ %Include kcmodulecontainer.sip ++ %Include tdecmodulecontainer.sip diff --git a/sip/kutils/kutilsmod.sip.in b/sip/kutils/kutilsmod.sip.in index 0124c99..ebd8f69 100644 --- a/sip/kutils/kutilsmod.sip.in +++ b/sip/kutils/kutilsmod.sip.in @@ -36,9 +36,9 @@ %Import tdeuimod.sip %Import kiomod.sip -%Include kcmoduleinfo.sip -%Include kcmoduleloader.sip -%Include kcmoduleproxy.sip +%Include tdecmoduleinfo.sip +%Include tdecmoduleloader.sip +%Include tdecmoduleproxy.sip %Include kcmultidialog.sip %Include kfind.sip %Include kfinddialog.sip diff --git a/sip/kutils/kcmoduleinfo.sip b/sip/kutils/tdecmoduleinfo.sip similarity index 99% rename from sip/kutils/kcmoduleinfo.sip rename to sip/kutils/tdecmoduleinfo.sip index 4664aa4..2adda6c 100644 --- a/sip/kutils/kcmoduleinfo.sip +++ b/sip/kutils/tdecmoduleinfo.sip @@ -29,7 +29,7 @@ class TDECModuleInfo { %TypeHeaderCode -#include +#include %End diff --git a/sip/kutils/kcmoduleloader.sip b/sip/kutils/tdecmoduleloader.sip similarity index 98% rename from sip/kutils/kcmoduleloader.sip rename to sip/kutils/tdecmoduleloader.sip index 6a21295..9d87854 100644 --- a/sip/kutils/kcmoduleloader.sip +++ b/sip/kutils/tdecmoduleloader.sip @@ -29,7 +29,7 @@ class TDECModuleLoader { %TypeHeaderCode -#include +#include %End diff --git a/sip/kutils/kcmoduleproxy.sip b/sip/kutils/tdecmoduleproxy.sip similarity index 98% rename from sip/kutils/kcmoduleproxy.sip rename to sip/kutils/tdecmoduleproxy.sip index 6224c01..6e65ce9 100644 --- a/sip/kutils/kcmoduleproxy.sip +++ b/sip/kutils/tdecmoduleproxy.sip @@ -29,7 +29,7 @@ class TDECModuleProxy : TQWidget { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/kcmodule.sip b/sip/tdeui/tdecmodule.sip similarity index 99% rename from sip/tdeui/kcmodule.sip rename to sip/tdeui/tdecmodule.sip index 0ff0b24..446f992 100644 --- a/sip/tdeui/kcmodule.sip +++ b/sip/tdeui/tdecmodule.sip @@ -27,7 +27,7 @@ class TDECModule : TQWidget { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in index a7a2abb..c9101c8 100644 --- a/sip/tdeui/tdeuimod.sip.in +++ b/sip/tdeui/tdeuimod.sip.in @@ -47,7 +47,7 @@ %Include kbuttonbox.sip %Include kcharselect.sip %Include kcmenumngr.sip -%Include kcmodule.sip +%Include tdecmodule.sip %Include kcolorbtn.sip %Include kcolorcombo.sip %Include kcolordialog.sip