From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kxsldbg/kxsldbg.cpp | 4 ++-- kxsldbg/kxsldbg.h | 6 +++--- kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 4 ++-- kxsldbg/kxsldbgpart/qxsldbgdoc.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kxsldbg') diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index a9aa23f0..49b2305e 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -100,14 +100,14 @@ void KXsldbg::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } -void KXsldbg::saveProperties(KConfig* /*config*/) +void KXsldbg::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void KXsldbg::readProperties(KConfig* /*config*/) +void KXsldbg::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h index 1d3ee6c6..5eb95600 100644 --- a/kxsldbg/kxsldbg.h +++ b/kxsldbg/kxsldbg.h @@ -48,14 +48,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); virtual bool closeURL(); diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index 1b8d2df3..eac763e0 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -18,7 +18,7 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); + connect(kDoc, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(lockDoc())); connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); @@ -47,7 +47,7 @@ QXsldbgDoc::~QXsldbgDoc() } } -void QXsldbgDoc::slotResult( KIO::Job *job ) +void QXsldbgDoc::slotResult( TDEIO::Job *job ) { if ( job->error() != 0 ){ }else{ diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 3661141f..2fabde26 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -44,7 +44,7 @@ signals: void docChanged(); private slots: - void slotResult( KIO::Job *job ); + void slotResult( TDEIO::Job *job ); void lockDoc(); void unlockDoc(); -- cgit v1.2.1