diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
| commit | 77343a1b8c1a5cb91a57039c4e595de33853a2d9 (patch) | |
| tree | ec168097bf95daefb0add7e401d151cf6a0b5948 /src/libgui | |
| parent | a1d4239c832b3bb1c8289f27831ef43b0a2eb941 (diff) | |
| download | piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.tar.gz piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/libgui')
| -rw-r--r-- | src/libgui/global_config.cpp | 2 | ||||
| -rw-r--r-- | src/libgui/likeback.cpp | 6 | ||||
| -rw-r--r-- | src/libgui/project_wizard.cpp | 2 | ||||
| -rw-r--r-- | src/libgui/text_editor.cpp | 2 | ||||
| -rw-r--r-- | src/libgui/toplevel.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp index e8fa5ca..085f799 100644 --- a/src/libgui/global_config.cpp +++ b/src/libgui/global_config.cpp @@ -10,7 +10,7 @@ #include "global_config.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "progs/list/prog_list.h" diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index db22241..0983080 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -20,7 +20,7 @@ #include <kapplication.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kaboutdata.h> #include <klocale.h> @@ -452,10 +452,10 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons) if (m_process) return; m_process = new TDEProcess(); - *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) ); if (!m_process->start()) { - kdDebug() << "Couldn't start kcmshell.." << endl; + kdDebug() << "Couldn't start tdecmshell.." << endl; delete m_process; m_process = 0; return; diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index ac622fe..4bd5a51 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -12,7 +12,7 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqstyle.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include "common/gui/purl_gui.h" diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index 077b8d8..45d340c 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -16,7 +16,7 @@ #include <klibloader.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kapplication.h> #include <tdetexteditor/markinterface.h> diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index c9c64da..55eac3f 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -24,10 +24,10 @@ #include <klocale.h> #include <kedittoolbar.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kcmdlineargs.h> -#include <kio/observer.h> +#include <tdeio/observer.h> #include <kiconloader.h> #include <kpopupmenu.h> #include <khelpmenu.h> |