diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
| commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
| tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /src/partcontroller.cpp | |
| parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
| download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip | |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'src/partcontroller.cpp')
| -rw-r--r-- | src/partcontroller.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 16bffcca..21b78a8c 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -54,14 +54,14 @@ #include "documentationpart.h" #include "ksavealldialog.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "urlutil.h" #include "mimewarningdialog.h" #include "domutil.h" -#include "tdevjobtimer.h" +#include "kdevjobtimer.h" #include "designer.h" -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "multibuffer.h" #include "partcontroller.h" @@ -90,7 +90,7 @@ struct ModificationData PartController::PartController(TQWidget *parent) - : TDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) + : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); @@ -348,7 +348,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if ( !addToCurrentBuffer ) { - if ( TDevLanguageSupport *lang = + if ( KDevLanguageSupport *lang = API::getInstance()->languageSupport() ) { // Let the language part override the addToCurrentBuffer flag @@ -406,11 +406,11 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, DesignerSetting = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designerintegration", DesignerSetting ); designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer", designerExec ); } - if ( DesignerSetting == "ExternalTDevDesigner" ) + if ( DesignerSetting == "ExternalKDevDesigner" ) { - designerExec = "tdevdesigner"; + designerExec = "kdevdesigner"; } - else if ( DesignerSetting == "EmbeddedTDevDesigner" ) + else if ( DesignerSetting == "EmbeddedKDevDesigner" ) { if ( KParts::ReadOnlyPart *designerPart = qtDesignerPart() ) { @@ -419,12 +419,12 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, designerPart->openURL(url); return; } - else if ( KParts::Factory * TDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libtdevdesignerpart" ) ) ) ) + else if ( KParts::Factory * KDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libkdevdesignerpart" ) ) ) ) { - KParts::ReadWritePart * tdevpart = static_cast<KParts::ReadWritePart*>( TDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart" ) ); - tdevpart->openURL( url ); + KParts::ReadWritePart * kdevpart = static_cast<KParts::ReadWritePart*>( KDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart" ) ); + kdevpart->openURL( url ); addHistoryEntry(); - integratePart( tdevpart, url ); + integratePart( kdevpart, url ); m_openRecentAction->addURL( url ); m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); return; @@ -1386,7 +1386,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - TDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } |