From 926615f13c25a9d0b25d7842054a71d3122d4f94 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:14:30 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- krename/ProgressDialog.cpp | 4 ++-- krename/commandplugin.cpp | 2 +- krename/fileplugin.cpp | 2 +- krename/helpdialog.cpp | 2 +- krename/kmylistbox.h | 2 +- krename/kmylistview.cpp | 2 +- krename/kmylistview.h | 2 +- krename/krenameimpl.cpp | 4 ++-- krename/profiledlg.cpp | 2 +- krename/replacedialog.cpp | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp index c390fe3..538ba50 100644 --- a/krename/ProgressDialog.cpp +++ b/krename/ProgressDialog.cpp @@ -24,9 +24,9 @@ // KDE includes #include #include -#include +#include #include -#include +#include #include #include diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp index e178ca2..81da8bd 100644 --- a/krename/commandplugin.cpp +++ b/krename/commandplugin.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krename/fileplugin.cpp b/krename/fileplugin.cpp index 62943ba..7c3dded 100644 --- a/krename/fileplugin.cpp +++ b/krename/fileplugin.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krename/helpdialog.cpp b/krename/helpdialog.cpp index e735b65..4bcb46c 100644 --- a/krename/helpdialog.cpp +++ b/krename/helpdialog.cpp @@ -24,7 +24,7 @@ // KDE includes #include -#include +#include #include #include diff --git a/krename/kmylistbox.h b/krename/kmylistbox.h index 99b9801..ccb584f 100644 --- a/krename/kmylistbox.h +++ b/krename/kmylistbox.h @@ -19,7 +19,7 @@ #define KMYLISTBOX_H // KDE includes -#include +#include #include #include diff --git a/krename/kmylistview.cpp b/krename/kmylistview.cpp index 885a494..6cf6bd0 100644 --- a/krename/kmylistview.cpp +++ b/krename/kmylistview.cpp @@ -21,7 +21,7 @@ // KDE includes #include #include -#include +#include #include KMyListView::KMyListView( TQValueList* _changes, KMyListBox* _list, TQWidget* parent, const char* name ) diff --git a/krename/kmylistview.h b/krename/kmylistview.h index c533ae8..c16c46f 100644 --- a/krename/kmylistview.h +++ b/krename/kmylistview.h @@ -20,7 +20,7 @@ #include "batchrenamer.h" #include "kmylistbox.h" -#include +#include #include class TQMouseEvent; diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp index 0163fd02..da8334a 100644 --- a/krename/krenameimpl.cpp +++ b/krename/krenameimpl.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp index 0d6b0d5..eb4daf3 100644 --- a/krename/profiledlg.cpp +++ b/krename/profiledlg.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krename/replacedialog.cpp b/krename/replacedialog.cpp index a58fbc5..efffcc6 100644 --- a/krename/replacedialog.cpp +++ b/krename/replacedialog.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include