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/quickopen/quickopen_part.cpp | 4 ++-- parts/quickopen/quickopenbase.ui | 2 +- parts/quickopen/quickopenclassdialog.cpp | 2 +- parts/quickopen/quickopendialog.cpp | 2 +- parts/quickopen/quickopenfiledialog.cpp | 2 +- parts/quickopen/quickopenfunctionchooseform.cpp | 2 +- parts/quickopen/quickopenfunctionchooseformbase.ui | 4 ++-- parts/quickopen/quickopenfunctiondialog.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'parts/quickopen') diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index ae8bae82..60bd2044 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -23,14 +23,14 @@ #include "quickopenfunctiondialog.h" #include "quickopenfiledialog.h" -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 1b29104a..6aea61b1 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -175,7 +175,7 @@ - klistbox.h + tdelistbox.h klineedit.h diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index 1a5be1e6..2248dfcc 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index b29af671..5032ee15 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index 38dbd387..ba2a674b 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index a8853417..b18da8b7 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -18,7 +18,7 @@ * */ -#include +#include #include #include #include diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index f4bae80b..88b47e53 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -225,7 +225,7 @@ ksqueezedtextlabel.h - klistbox.h - klistbox.h + tdelistbox.h + tdelistbox.h diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index 859597f5..4a3a0888 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.1