diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:06 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:06 -0600 |
commit | 626b7f450d4687d85fa365abbd1c834bc5b54033 (patch) | |
tree | 9e9cd237a6d0aadc7134d81c14e02c0e47f3b83e | |
parent | 74b3ea38c5a98cbc73839d9ef4590708f2515cee (diff) | |
download | kpicosim-626b7f450d4687d85fa365abbd1c834bc5b54033.tar.gz kpicosim-626b7f450d4687d85fa365abbd1c834bc5b54033.zip |
Rename many classes and header files to avoid conflicts with KDE4
-rwxr-xr-x | src/cassembler.h | 2 | ||||
-rwxr-xr-x | src/kpicosim.cpp | 2 | ||||
-rwxr-xr-x | src/kpicosim.h | 8 | ||||
-rwxr-xr-x | src/kportview.h | 2 | ||||
-rwxr-xr-x | src/kprocessorview.h | 4 | ||||
-rwxr-xr-x | src/kscratchpadview.h | 2 | ||||
-rwxr-xr-x | src/kserialview.h | 2 | ||||
-rwxr-xr-x | 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 <string> #include <list> #include <vector> -#include <klistview.h> +#include <tdelistview.h> #include <algorithm> #include <cctype> 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 <tqlabel.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kmenubar.h> 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 <config.h> #endif -#include <kmainwindow.h> -#include <klistview.h> +#include <tdemainwindow.h> +#include <tdelistview.h> #include <tqsplitter.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> #include <tqtabwidget.h> #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 <ktoolbar.h> +#include <tdetoolbar.h> #include <tqcheckbox.h> #include <klineedit.h> #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 <ktoolbar.h> +#include <tdetoolbar.h> #include <knuminput.h> #include <tqcheckbox.h> -#include <klistview.h> +#include <tdelistview.h> 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 <ktoolbar.h> +#include <tdetoolbar.h> #include <ktextedit.h> 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 <ktoolbar.h> +#include <tdetoolbar.h> #include <ktextedit.h> #include <klineedit.h> #include <tqcheckbox.h> 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 <string> #include <tqtimer.h> -#include <klistview.h> +#include <tdelistview.h> #include "kprocessorview.h" |