summaryrefslogtreecommitdiffstats
path: root/src/libgui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:15 -0600
commitbd55e01bc4764c5daa84bf46db6978d43898d619 (patch)
treeefc4b389d1eaffa183eb963c9e0aea1440c934c8 /src/libgui
parente39f93c92e88ec461668231778cbba570c82250b (diff)
downloadpiklab-bd55e01bc4764c5daa84bf46db6978d43898d619.tar.gz
piklab-bd55e01bc4764c5daa84bf46db6978d43898d619.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/libgui')
-rw-r--r--src/libgui/likeback.cpp6
-rw-r--r--src/libgui/likeback.h4
-rw-r--r--src/libgui/toplevel.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 6740322..d5af677 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -451,9 +451,9 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
{
if (m_process)
return;
- m_process = new KProcess();
+ m_process = new TDEProcess();
*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
- connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
+ connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
if (!m_process->start()) {
kdDebug() << "Couldn't start kcmshell.." << endl;
delete m_process;
@@ -625,7 +625,7 @@ void LikeBackDialog::send()
"protocol=" + KURL::encode_string("1.0") + "&" +
"type=" + KURL::encode_string(type) + "&" +
"version=" + KURL::encode_string(LikeBack::about()->version()) + "&" +
- "locale=" + KURL::encode_string(KGlobal::locale()->language()) + "&" +
+ "locale=" + KURL::encode_string(TDEGlobal::locale()->language()) + "&" +
"window=" + KURL::encode_string(m_windowName) + "&" +
"context=" + KURL::encode_string(m_context) + "&" +
"comment=" + KURL::encode_string(m_comment->text()) + "&" +
diff --git a/src/libgui/likeback.h b/src/libgui/likeback.h
index 95046c3..fa1e260 100644
--- a/src/libgui/likeback.h
+++ b/src/libgui/likeback.h
@@ -26,7 +26,7 @@
class TQTextEdit;
class TQToolButton;
class TQPushButton;
-class KProcess;
+class TDEProcess;
class KConfig;
class TDEAboutData;
@@ -87,7 +87,7 @@ class LikeBack : public TQWidget
Button m_buttons;
TQToolButton *m_configureButton;
TQString m_fetchedEmail;
- KProcess *m_process;
+ TDEProcess *m_process;
static TQString s_hostName;
static TQString s_remotePath;
static TQ_UINT16 s_hostPort;
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index c724d1a..a9ac10e 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -402,7 +402,7 @@ void MainWindow::openRecentFile(const KURL &kurl)
void MainWindow::configureToolbar()
{
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(applyToolbarSettings()));
dlg.exec();
@@ -411,7 +411,7 @@ void MainWindow::configureToolbar()
void MainWindow::applyToolbarSettings()
{
createGUI();
- applyMainWindowSettings(KGlobal::config(), "MainWindow");
+ applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
void MainWindow::configure(ConfigCenter::Type showType)