diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/applets/clock | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/clock')
| -rw-r--r-- | kicker/applets/clock/analog.ui | 2 | ||||
| -rw-r--r-- | kicker/applets/clock/clock.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/digital.ui | 2 | ||||
| -rw-r--r-- | kicker/applets/clock/fuzzy.ui | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/init.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/settings.ui | 8 | ||||
| -rw-r--r-- | kicker/applets/clock/zone.cpp | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index 024caaefe..e7181c521 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -332,7 +332,7 @@ </tabstops> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">kfontrequester.h</include> + <include location="local" impldecl="in implementation">tdefontrequester.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 92420e652..58f6d9da1 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kprocess.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <kglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index 1450e6f4f..7fad42834 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -289,7 +289,7 @@ </tabstops> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">kfontrequester.h</include> + <include location="local" impldecl="in implementation">tdefontrequester.h</include> <include location="local" impldecl="in implementation">digital.ui.h</include> </includes> <Q_SLOTS> diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 28bcd7185..386315bc2 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -275,13 +275,13 @@ </tabstops> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">kfontrequester.h</include> + <include location="local" impldecl="in implementation">tdefontrequester.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> </includehints> </UI> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 8cf336866..4285ff749 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kprocess.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <kglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 170a830f4..6f63694a4 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -497,7 +497,7 @@ <includes> <include location="local" impldecl="in implementation">tqheader.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">kfontrequester.h</include> + <include location="local" impldecl="in implementation">tdefontrequester.h</include> </includes> <Q_SLOTS> <slot>configureType()</slot> @@ -507,10 +507,10 @@ <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdefontrequester.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index f8c2fc59a..3a313fbe8 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqfile.h> #include <tqtooltip.h> -#include <klistview.h> +#include <tdelistview.h> #include <time.h> #include <stdlib.h> // for getenv() |