From 783715b853042d24841e3e888051f3a184e78a40 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 22:00:04 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kregexpeditor/KMultiFormListBox/ccp.cpp | 2 +- kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp | 2 +- kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp | 2 +- kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h | 2 +- kregexpeditor/altnwidget.cpp | 4 ++-- kregexpeditor/auxbuttons.cpp | 2 +- kregexpeditor/charselector.cpp | 2 +- kregexpeditor/compoundregexp.cpp | 2 +- kregexpeditor/compoundwidget.cpp | 2 +- kregexpeditor/editorwindow.cpp | 4 ++-- kregexpeditor/emacsregexpconverter.cpp | 4 ++-- kregexpeditor/errormap.cpp | 4 ++-- kregexpeditor/gen_qregexpparser.cc | 4 ++-- kregexpeditor/infopage.cpp | 2 +- kregexpeditor/kregexpeditorgui.cpp | 2 +- kregexpeditor/kregexpeditorprivate.cpp | 4 ++-- kregexpeditor/lookaheadwidget.cpp | 2 +- kregexpeditor/main.cpp | 2 +- kregexpeditor/qregexpparser.y | 4 ++-- kregexpeditor/regexpbuttons.cpp | 2 +- kregexpeditor/repeatregexp.cpp | 4 ++-- kregexpeditor/repeatwidget.cpp | 2 +- kregexpeditor/textrangeregexp.cpp | 4 ++-- kregexpeditor/textregexp.cpp | 4 ++-- kregexpeditor/userdefinedregexps.cpp | 4 ++-- kregexpeditor/verifier.cpp | 2 +- kregexpeditor/verifybuttons.cpp | 4 ++-- kregexpeditor/widgetfactory.cpp | 2 +- kregexpeditor/zerowidgets.cpp | 2 +- 29 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kregexpeditor') diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp index 8197d2c..078ee7f 100644 --- a/kregexpeditor/KMultiFormListBox/ccp.cpp +++ b/kregexpeditor/KMultiFormListBox/ccp.cpp @@ -26,7 +26,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #endif CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() { diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp index 5c67526..09c5052 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp @@ -20,7 +20,7 @@ #include "compat.h" #include #else - #include + #include #include "tdemultiformlistbox-multivisible.moc" #endif diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp index 29f2ea3..f39c9e9 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp @@ -18,7 +18,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include #include #include "tdemultiformlistbox-windowed.moc" diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h index 1151581..1918625 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h @@ -28,7 +28,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #endif class TQDataStream; diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index f34c8c5..3196288 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -18,8 +18,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include "altnwidget.h" diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index e276acf..e47abfa 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -22,7 +22,7 @@ #else #include "auxbuttons.moc" #include - #include + #include #endif #include "auxbuttons.h" diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index 4eb9ada..5574c0f 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -19,7 +19,7 @@ #ifdef TQT_ONLY #include "compat.h" #else -#include +#include #include "charselector.moc" #endif diff --git a/kregexpeditor/compoundregexp.cpp b/kregexpeditor/compoundregexp.cpp index 150ee97..ae7bab9 100644 --- a/kregexpeditor/compoundregexp.cpp +++ b/kregexpeditor/compoundregexp.cpp @@ -19,7 +19,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #endif #include "compoundregexp.h" diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index e19e3aa..98f3975 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -19,7 +19,7 @@ #include "compat.h" #include "images.h" #else - #include + #include #include #include #include "compoundwidget.moc" diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index e6a92e7..1b43041 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -20,8 +20,8 @@ #include "compat.h" #include "images.h" #else - #include - #include + #include + #include // #include #include #include diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp index 491e989..316cf7c 100644 --- a/kregexpeditor/emacsregexpconverter.cpp +++ b/kregexpeditor/emacsregexpconverter.cpp @@ -28,8 +28,8 @@ #include "positionregexp.h" #include "repeatregexp.h" -#include -#include +#include +#include bool EmacsRegExpConverter::canParse() { return false; diff --git a/kregexpeditor/errormap.cpp b/kregexpeditor/errormap.cpp index 65ca557..68b8de9 100644 --- a/kregexpeditor/errormap.cpp +++ b/kregexpeditor/errormap.cpp @@ -19,8 +19,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include "errormap.h" diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc index f72775b..377f549 100644 --- a/kregexpeditor/gen_qregexpparser.cc +++ b/kregexpeditor/gen_qregexpparser.cc @@ -103,8 +103,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp index 558f00c..0afa3ea 100644 --- a/kregexpeditor/infopage.cpp +++ b/kregexpeditor/infopage.cpp @@ -18,7 +18,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include #endif diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index d604e79..46fc452 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -19,7 +19,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include #include #include "kregexpeditorgui.moc" diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 147e348..04ae00a 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -19,10 +19,10 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include #include - #include + #include #include "kregexpeditorprivate.moc" #endif diff --git a/kregexpeditor/lookaheadwidget.cpp b/kregexpeditor/lookaheadwidget.cpp index 5ae0b9d..c45268e 100644 --- a/kregexpeditor/lookaheadwidget.cpp +++ b/kregexpeditor/lookaheadwidget.cpp @@ -19,7 +19,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include "lookaheadwidget.moc" #endif diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 20eb040..728bb19 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -23,7 +23,7 @@ #include #include #include - #include + #include #include #endif diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y index 080dc2c..868c1dd 100644 --- a/kregexpeditor/qregexpparser.y +++ b/kregexpeditor/qregexpparser.y @@ -19,8 +19,8 @@ #ifdef QT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index 62500c8..a6bb121 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -20,7 +20,7 @@ #include "images.h" #else #include - #include + #include #include #include "regexpbuttons.moc" #endif diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp index 92b5ac8..931b61f 100644 --- a/kregexpeditor/repeatregexp.cpp +++ b/kregexpeditor/repeatregexp.cpp @@ -18,8 +18,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include "kmessagebox.h" - #include + #include "tdemessagebox.h" + #include #endif #include "repeatregexp.h" diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index e934122..085c36b 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -18,7 +18,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include #include "repeatwidget.moc" #endif diff --git a/kregexpeditor/textrangeregexp.cpp b/kregexpeditor/textrangeregexp.cpp index 0a92073..fe572cc 100644 --- a/kregexpeditor/textrangeregexp.cpp +++ b/kregexpeditor/textrangeregexp.cpp @@ -18,8 +18,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include "textrangeregexp.h" diff --git a/kregexpeditor/textregexp.cpp b/kregexpeditor/textregexp.cpp index c31f9ac..ffcc14b 100644 --- a/kregexpeditor/textregexp.cpp +++ b/kregexpeditor/textregexp.cpp @@ -18,8 +18,8 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include - #include + #include + #include #endif #include "textregexp.h" diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index 16f191f..e6d83aa 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -19,8 +19,8 @@ #include "compat.h" #else #include - #include - #include + #include + #include #include #include #include "userdefinedregexps.moc" diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp index 23198be..81e7ffe 100644 --- a/kregexpeditor/verifier.cpp +++ b/kregexpeditor/verifier.cpp @@ -18,7 +18,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #include "verifier.moc" #endif diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index ed47b7c..5f60e0b 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -20,12 +20,12 @@ #include #include "images.h" #else -#include +#include #include "verifybuttons.moc" #include #include #include -#include +#include #endif #include "verifybuttons.h" diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index 43a1008..d42e7fe 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -18,7 +18,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #endif #include "widgetfactory.h" diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp index c403dce..c2a19ef 100644 --- a/kregexpeditor/zerowidgets.cpp +++ b/kregexpeditor/zerowidgets.cpp @@ -19,7 +19,7 @@ #ifdef TQT_ONLY #include "compat.h" #else - #include + #include #endif #include "zerowidgets.h" -- cgit v1.2.1