diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdespell2 | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdespell2')
| -rw-r--r-- | tdespell2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdespell2/broker.cpp | 2 | ||||
| -rw-r--r-- | tdespell2/plugins/ispell/ispell_checker.cpp | 2 | ||||
| -rw-r--r-- | tdespell2/plugins/ispell/ispell_checker.h | 2 | ||||
| -rw-r--r-- | tdespell2/settings.cpp | 2 | ||||
| -rw-r--r-- | tdespell2/ui/dialog.cpp | 2 | ||||
| -rw-r--r-- | tdespell2/ui/highlighter.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/tdespell2/CMakeLists.txt b/tdespell2/CMakeLists.txt index ffd852066..01b910862 100644 --- a/tdespell2/CMakeLists.txt +++ b/tdespell2/CMakeLists.txt @@ -21,8 +21,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeutils - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( diff --git a/tdespell2/broker.cpp b/tdespell2/broker.cpp index 4dfc0f211..a5df8178c 100644 --- a/tdespell2/broker.cpp +++ b/tdespell2/broker.cpp @@ -30,7 +30,7 @@ #include <kplugininfo.h> #include <ktrader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> diff --git a/tdespell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp index c07d9a55f..2bcf7ec92 100644 --- a/tdespell2/plugins/ispell/ispell_checker.cpp +++ b/tdespell2/plugins/ispell/ispell_checker.cpp @@ -197,7 +197,7 @@ ISpellChecker::ISpellChecker() m_chartypes(NULL), m_infile(NULL), m_outfile(NULL), - m_askfilename(NULL), + m_astdefilename(NULL), m_Trynum(0), m_translate_in(0) { diff --git a/tdespell2/plugins/ispell/ispell_checker.h b/tdespell2/plugins/ispell/ispell_checker.h index 84faa34f9..b9d02c177 100644 --- a/tdespell2/plugins/ispell/ispell_checker.h +++ b/tdespell2/plugins/ispell/ispell_checker.h @@ -245,7 +245,7 @@ private: FILE * m_infile; /* File being corrected */ FILE * m_outfile; /* Corrected copy of infile */ - char * m_askfilename; /* File specified in -f option */ + char * m_astdefilename; /* File specified in -f option */ int m_changes; /* NZ if changes made to cur. file */ int m_readonly; /* NZ if current file is readonly */ diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp index 63b45e89d..d1d050ce7 100644 --- a/tdespell2/settings.cpp +++ b/tdespell2/settings.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqmap.h> diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp index 82548a406..a0ff36c01 100644 --- a/tdespell2/ui/dialog.cpp +++ b/tdespell2/ui/dialog.cpp @@ -27,7 +27,7 @@ #include "dictionary.h" #include "settings.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 2d185462d..176d69232 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -24,7 +24,7 @@ #include "dictionary.h" #include "settings.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqtextedit.h> |