From 5be945600e2d7776e74663f56c2a25a8f57d7891 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:22:57 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- parts/documentation/bookmarkview.cpp | 2 +- parts/documentation/contentsview.cpp | 2 +- parts/documentation/docconfiglistview.h | 2 +- parts/documentation/docglobalconfigwidget.cpp | 2 +- parts/documentation/docglobalconfigwidgetbase.ui | 4 ++-- parts/documentation/documentation_part.cpp | 4 ++-- parts/documentation/docutils.cpp | 2 +- parts/documentation/find_documentation.cpp | 2 +- parts/documentation/find_documentation_options.cpp | 2 +- parts/documentation/find_documentationbase.ui | 2 +- parts/documentation/interfaces/kdevdocumentationplugin.h | 4 ++-- parts/documentation/plugins/chm/docchmplugin.cpp | 2 +- parts/documentation/plugins/custom/doccustomplugin.cpp | 2 +- parts/documentation/plugins/djvu/docdjvuplugin.cpp | 2 +- parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp | 2 +- parts/documentation/plugins/pdb/docpdbplugin.cpp | 2 +- parts/documentation/plugins/pdf/docpdfplugin.cpp | 2 +- parts/documentation/plugins/qt/docqtplugin.cpp | 2 +- parts/documentation/searchview.cpp | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) (limited to 'parts/documentation') diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 5cf527ab..7b2945f4 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 42b4be64..2d1c8230 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index 474655b0..561c326d 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -20,7 +20,7 @@ #ifndef DOCCONFIGLISTVIEW_H #define DOCCONFIGLISTVIEW_H -#include +#include class DocConfigListView : public TDEListView { diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index df41666b..f0559510 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 12c4de1a..78b27b22 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -564,9 +564,9 @@ kurlrequester.h klineedit.h kpushbutton.h - kfontcombo.h + tdefontcombo.h klineedit.h - kfontcombo.h + tdefontcombo.h klineedit.h diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index e618c2a3..10419a3b 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index 12fb1dd1..879177db 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 9e97ecce..91f94af8 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index 54aac7ac..61990e9a 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index cae5096a..e983c8e0 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -165,6 +165,6 @@ klineedit.h - klistview.h + tdelistview.h diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index e5e71ca2..a5dbe458 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index be624209..587f635d 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index bc6488bf..317bdf8b 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index 7cb92879..2d9a4731 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index cf0676a2..2e21d5c3 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 8ad1dc43..9f9ec045 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 0e1373a0..b8fe76b4 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 69a52a64..58d2dd4e 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 47131b03..f33823c3 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.3