diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:38:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:38:54 -0600 |
| commit | da1522385e5367bae56b90fac55c4355e475905b (patch) | |
| tree | bfa432864dbf322feb4ed3a878f1222ee8ea7727 /lib/widgets | |
| parent | b9e542d0c805e9adee3a67e44532d5321032e21e (diff) | |
| download | tdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib/widgets')
| -rw-r--r-- | lib/widgets/kdevhtmlpart.cpp | 6 | ||||
| -rw-r--r-- | lib/widgets/kdevhtmlpart.h | 2 | ||||
| -rw-r--r-- | lib/widgets/klistviewaction.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 323c2cc7..abbeebbc 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -27,7 +27,7 @@ KDevHTMLPart::KDevHTMLPart() connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), this, TQT_SLOT(openURLRequest(const KURL &)) ); - connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* ))); + connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); @@ -78,7 +78,7 @@ KDevHTMLPart::KDevHTMLPart() //END documentation history stuff //settings: - KConfig *appConfig = TDEGlobal::config(); + TDEConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); setStandardFont(appConfig->readEntry("StandardFont", settings()->stdFontName())); @@ -354,7 +354,7 @@ void KDevHTMLPart::slotStop( ) closeURL(); } -void KDevHTMLPart::slotStarted( KIO::Job * ) +void KDevHTMLPart::slotStarted( TDEIO::Job * ) { stopAction->setEnabled(true); } diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index c9520d7f..805134a0 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -64,7 +64,7 @@ signals: protected slots: - void slotStarted(KIO::Job *); + void slotStarted(TDEIO::Job *); void slotCompleted(); void slotCancelled(const TQString &errMsg); diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index adedc5a4..b4110375 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -28,7 +28,7 @@ KListViewAction::~KListViewAction() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (config && m_view->name()) { config->setGroup("KListViewAction"); @@ -76,7 +76,7 @@ void KListViewAction::setWhatsThis( const TQString & str ) void KListViewAction::loadComboWidth( ) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (config && m_view->name()) { config->setGroup("KListViewAction"); |