summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:51 -0600
commitabef44c4d682c4a656465f91d019cc1af1b989d1 (patch)
tree7cd5712ae2aec020675938183e0619b62376abcc /src/gui
parent9aa2a73641f4d386c9667ac946cebfabca872940 (diff)
downloadktechlab-abef44c4d682c4a656465f91d019cc1af1b989d1.tar.gz
ktechlab-abef44c4d682c4a656465f91d019cc1af1b989d1.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/itemselector.h2
-rw-r--r--src/gui/linkeroptionswidget.ui2
-rw-r--r--src/gui/oscilloscopeview.cpp2
-rw-r--r--src/gui/plvitem.cpp2
-rw-r--r--src/gui/plvitem.h2
-rw-r--r--src/gui/propertieslistview.h2
-rw-r--r--src/gui/symbolviewer.h2
7 files changed, 7 insertions, 7 deletions
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 <klistview.h>
+#include <tdelistview.h>
#include <tqpixmap.h>
#include <tqstring.h>
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 @@
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>
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 <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqcheckbox.h>
#include <tqcursor.h>
#include <tqevent.h>
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 <klistview.h>
+#include <tdelistview.h>
#include <tqpainter.h>
#include <tqvariant.h>
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 <klistview.h>
+#include <tdelistview.h>
#include <tqstring.h>
#include <tqguardedptr.h>
#include <tqobject.h>
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 <klistview.h>
+#include <tdelistview.h>
#include <tqmap.h>
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 <klistview.h>
+#include <tdelistview.h>
#include <tqguardedptr.h>
class KComboBox;