diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:04 -0600 |
| commit | 72a82366e0b94a52125683f3ee3a8ffd3691294b (patch) | |
| tree | 787ee6497a0bf5e2e730f58d57dcbc9dc5377548 /xparts/mozilla | |
| parent | 43e3dc950c8050c2ba850b5707077790870aa734 (diff) | |
| download | tdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.tar.gz tdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'xparts/mozilla')
| -rw-r--r-- | xparts/mozilla/kmozillapart.cpp | 2 | ||||
| -rw-r--r-- | xparts/mozilla/kmozillapart.h | 4 | ||||
| -rw-r--r-- | xparts/mozilla/kshell.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index a853f737..f083d779 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -21,7 +21,7 @@ KMozillaPart::KMozillaPart(TQWidget *parentWidget, const char *widgetName, { setInstance( KMozillaPartFactory::instance() ); - m_partProcess = new KProcess; + m_partProcess = new TDEProcess; *m_partProcess << "kmozilla" << kapp->dcopClient()->appId() << objId(); m_partProcess->start(); diff --git a/xparts/mozilla/kmozillapart.h b/xparts/mozilla/kmozillapart.h index 2df5506a..00589d14 100644 --- a/xparts/mozilla/kmozillapart.h +++ b/xparts/mozilla/kmozillapart.h @@ -4,7 +4,7 @@ #include "xparthost_kpart.h" class TDEAboutData; -class KProcess; +class TDEProcess; class KMozillaPart : public XPartHost_KPart { @@ -20,7 +20,7 @@ public: static TDEAboutData *createAboutData(); private: - KProcess *m_partProcess; + TDEProcess *m_partProcess; }; #endif diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index dd5986b2..9e83f9a4 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -25,7 +25,7 @@ public: connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); #if 1 - m_partProcess = new KProcess; + m_partProcess = new TDEProcess; *m_partProcess << "./kmozilla" << kapp->dcopClient()->appId() << m_host->objId(); m_partProcess->start(); @@ -57,7 +57,7 @@ public slots: private: XPartHost_KPart *m_host; - KProcess *m_partProcess; + TDEProcess *m_partProcess; }; int main( int argc, char **argv ) |