From abef44c4d682c4a656465f91d019cc1af1b989d1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:14:51 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- src/gui/itemselector.h | 2 +- src/gui/linkeroptionswidget.ui | 2 +- src/gui/oscilloscopeview.cpp | 2 +- src/gui/plvitem.cpp | 2 +- src/gui/plvitem.h | 2 +- src/gui/propertieslistview.h | 2 +- src/gui/symbolviewer.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui') diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h index 72df34f..18cf387 100644 --- a/src/gui/itemselector.h +++ b/src/gui/itemselector.h @@ -11,7 +11,7 @@ #ifndef ITEMSELECTOR_H #define ITEMSELECTOR_H -#include +#include #include #include diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui index e353f5e..c97dbbc 100644 --- a/src/gui/linkeroptionswidget.ui +++ b/src/gui/linkeroptionswidget.ui @@ -172,7 +172,7 @@ kcombobox.h klineedit.h klineedit.h - klistview.h + tdelistview.h keditlistbox.h klineedit.h diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index b7673a7..e827814 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/plvitem.cpp b/src/gui/plvitem.cpp index 24b12ac..a94af4c 100644 --- a/src/gui/plvitem.cpp +++ b/src/gui/plvitem.cpp @@ -11,7 +11,7 @@ #include "plvitem.h" #include "variant.h" -#include +#include #include #include diff --git a/src/gui/plvitem.h b/src/gui/plvitem.h index 5dd653c..78afcb9 100644 --- a/src/gui/plvitem.h +++ b/src/gui/plvitem.h @@ -11,7 +11,7 @@ #ifndef PLVITEM_H #define PLVITEM_H -#include +#include #include #include #include diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h index dd75276..70b2180 100644 --- a/src/gui/propertieslistview.h +++ b/src/gui/propertieslistview.h @@ -11,7 +11,7 @@ #ifndef PROPERTIESLISTVIEW_H #define PROPERTIESLISTVIEW_H -#include +#include #include class CNItemGroup; diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index 68826a4..d0ab0d7 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -14,7 +14,7 @@ #ifndef SYMBOLVIEWER_H #define SYMBOLVIEWER_H -#include +#include #include class KComboBox; -- cgit v1.2.1