From 9dea9bbfaa7a09a9bd01bb40750d7a5f5b3600f8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:17:29 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- sip/tdefile/tdefile-kde352.diff | 2 +- sip/tdefile/tdefilemod.sip.in | 2 +- sip/tdefile/tderecentdirs.sip | 2 +- sip/tdefile/tderecentdocument.sip | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sip/tdefile') 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 -- cgit v1.2.1