Rename many classes and header files to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent 5d44a8d2b8
commit 05e000a316

@ -12192,7 +12192,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kglobal.h>
++#include <kglobalsettings.h>
++#include <klocale.h>
++#include <kmainwindow.h>
++#include <tdemainwindow.h>
++#include <kmenubar.h>
++#include <kprotocolmanager.h>
++#include <kstartupinfo.h>

@ -12192,7 +12192,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kglobal.h>
++#include <kglobalsettings.h>
++#include <klocale.h>
++#include <kmainwindow.h>
++#include <tdemainwindow.h>
++#include <kmenubar.h>
++#include <kprotocolmanager.h>
++#include <kstartupinfo.h>

@ -1557,7 +1557,7 @@ index 0000000..d0f1444
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
@ -2299,7 +2299,7 @@ index 0000000..d0f1444
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>

@ -12229,7 +12229,7 @@ index 0000000..91f59f9
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>
@ -13520,7 +13520,7 @@ index 0000000..9c9f008
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
+#include <kmainwindow.h>
+#include <tdemainwindow.h>
+#include <kmenubar.h>
+#include <kprotocolmanager.h>
+#include <kstartupinfo.h>

Loading…
Cancel
Save