diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:55:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:55:53 -0600 |
| commit | 3f4482bc104b1d8002664e0f616b9c40fdcac452 (patch) | |
| tree | eba60514db843677c1d234e3b1addbdc236bf694 /src/gui | |
| parent | 3604ea743138ab66be563a8b29d7c2b971cb77bd (diff) | |
| download | ktechlab-3f4482bc104b1d8002664e0f616b9c40fdcac452.tar.gz ktechlab-3f4482bc104b1d8002664e0f616b9c40fdcac452.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemselector.cpp | 2 | ||||
| -rw-r--r-- | src/gui/oscilloscope.cpp | 2 | ||||
| -rw-r--r-- | src/gui/oscilloscopeview.cpp | 2 | ||||
| -rw-r--r-- | src/gui/outputmethoddlg.cpp | 2 | ||||
| -rw-r--r-- | src/gui/projectdlgs.cpp | 2 | ||||
| -rw-r--r-- | src/gui/settingsdlg.cpp | 2 | ||||
| -rw-r--r-- | src/gui/settingsdlg.h | 2 | ||||
| -rw-r--r-- | src/gui/symbolviewer.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index fbc4cf1..32e0cf6 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -19,7 +19,7 @@ #include "mechanicsdocument.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 2935e7a..7bc0a07 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -18,7 +18,7 @@ #include <cmath> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index b2535ae..81471b2 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -14,7 +14,7 @@ #include "probepositioner.h" #include "simulator.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kglobal.h> diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp index 9260fdc..cb53109 100644 --- a/src/gui/outputmethoddlg.cpp +++ b/src/gui/outputmethoddlg.cpp @@ -18,7 +18,7 @@ #include "projectmanager.h" #include <kcombobox.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <kdebug.h> #include <ktempfile.h> #include <kurlrequester.h> diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index 7852ff9..d6f0ac6 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -20,7 +20,7 @@ #include <assert.h> #include <kcombobox.h> #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <klocale.h> #include <kurlrequester.h> diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index c267fc4..69d619c 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -22,7 +22,7 @@ #include <kapplication.h> #include <kcolorbutton.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kinputdialog.h> #include <klineedit.h> #include <klocale.h> diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h index 0abf212..9d747cf 100644 --- a/src/gui/settingsdlg.h +++ b/src/gui/settingsdlg.h @@ -11,7 +11,7 @@ #ifndef SETTINGSDLG_H #define SETTINGSDLG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <tqmap.h> class AsmFormattingWidget; diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index 719618e..71265b6 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -15,7 +15,7 @@ #include "symbolviewer.h" #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <tqlabel.h> |