From 626b7f450d4687d85fa365abbd1c834bc5b54033 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:14:06 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- src/cassembler.h | 2 +- src/kpicosim.cpp | 2 +- src/kpicosim.h | 8 ++++---- src/kportview.h | 2 +- src/kprocessorview.h | 4 ++-- src/kscratchpadview.h | 2 +- src/kserialview.h | 2 +- src/ksimulator.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cassembler.h b/src/cassembler.h index fdd120e..7cced12 100755 --- a/src/cassembler.h +++ b/src/cassembler.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp index 8bd0dc4..236b204 100755 --- a/src/kpicosim.cpp +++ b/src/kpicosim.cpp @@ -63,7 +63,7 @@ #include -#include +#include #include #include diff --git a/src/kpicosim.h b/src/kpicosim.h index 482d4f7..c0bad05 100755 --- a/src/kpicosim.h +++ b/src/kpicosim.h @@ -29,11 +29,11 @@ #include #endif -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include "kprocessorview.h" #include "kserialview.h" diff --git a/src/kportview.h b/src/kportview.h index 694f805..79a197f 100755 --- a/src/kportview.h +++ b/src/kportview.h @@ -20,7 +20,7 @@ #ifndef KPORTVIEW_H #define KPORTVIEW_H -#include +#include #include #include #include "kport.h" diff --git a/src/kprocessorview.h b/src/kprocessorview.h index 81c8d98..e22b624 100755 --- a/src/kprocessorview.h +++ b/src/kprocessorview.h @@ -2,10 +2,10 @@ #define KPROCESSORVIEW_H -#include +#include #include #include -#include +#include class MyListView : public TDEListView { diff --git a/src/kscratchpadview.h b/src/kscratchpadview.h index cf1322a..0bee5c7 100755 --- a/src/kscratchpadview.h +++ b/src/kscratchpadview.h @@ -20,7 +20,7 @@ #ifndef KSCRATCHPADVIEW_H #define KSCRATCHPADVIEW_H -#include +#include #include class KScratchpadView : public TDEToolBar diff --git a/src/kserialview.h b/src/kserialview.h index d43565a..8735d9d 100755 --- a/src/kserialview.h +++ b/src/kserialview.h @@ -20,7 +20,7 @@ #ifndef KSERIALVIEW_H #define KSERIALVIEW_H -#include +#include #include #include #include diff --git a/src/ksimulator.h b/src/ksimulator.h index 7ad59a0..bd5ebe7 100755 --- a/src/ksimulator.h +++ b/src/ksimulator.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "kprocessorview.h"