From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- parts/filecreate/filecreate_part.cpp | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'parts/filecreate/filecreate_part.cpp') diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 11fcfa6c..19deeb66 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -30,10 +30,10 @@ #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" #include "configwidgetproxy.h" #include "filetemplate.h" @@ -50,23 +50,23 @@ #define PROJECTSETTINGSPAGE 1 #define GLOBALSETTINGSPAGE 2 -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "config.h" -static const TDevPluginInfo data("tdevfilecreate"); +static const KDevPluginInfo data("kdevfilecreate"); -typedef TDevGenericFactory FileCreateFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevfilecreate, FileCreateFactory( data ) ) +typedef KDevGenericFactory FileCreateFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) using namespace FileCreate; FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) -// : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) - : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) +// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); - setXMLFile("tdevpart_filecreate.rc"); + setXMLFile("kdevpart_filecreate.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); @@ -179,10 +179,10 @@ void FileCreatePart::slotNewFilePopup( int pFileType ) } void FileCreatePart::slotNewFile() { - TDevCreateFile::CreatedFile createdFile = createNewFile(); - if (createdFile.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED) + KDevCreateFile::CreatedFile createdFile = createNewFile(); + if (createdFile.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED) KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid.")); - else if (createdFile.status != TDevCreateFile::CreatedFile::STATUS_CANCELED) + else if (createdFile.status != KDevCreateFile::CreatedFile::STATUS_CANCELED) openCreatedFile(createdFile); } @@ -209,7 +209,7 @@ void FileCreatePart::slotProjectClosed() { void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { - TDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), + KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), TQString(), TQString(), filetype->subtypeRef()); @@ -217,9 +217,9 @@ void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { openCreatedFile(createdFile); } -void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & createdFile) +void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & createdFile) { - if ( createdFile.status == TDevCreateFile::CreatedFile::STATUS_OK ) + if ( createdFile.status == KDevCreateFile::CreatedFile::STATUS_OK ) { KURL uu( createdFile.dir + "/" + createdFile.filename ); partController()->editDocument ( uu ); @@ -228,7 +228,7 @@ void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & created int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList &m_filetypes, bool enable) { int numRead = 0; - TQDomElement fileTypes = DomUtil::elementByPath(dom,"/tdevfilecreate/filetypes"); + TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes"); if (!fileTypes.isNull()) { for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) { @@ -324,16 +324,16 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su return NULL; } -// TDevFileCreate interface +// KDevFileCreate interface -TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype) +KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype) { - TDevCreateFile::CreatedFile result; + KDevCreateFile::CreatedFile result; KURL projectURL; if ( !project() ) { - //result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED; + //result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED; //return result; } else @@ -373,7 +373,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString int dialogResult = dialog.exec(); if (dialogResult == KDialogBase::Rejected) { - result.status = TDevCreateFile::CreatedFile::STATUS_CANCELED; + result.status = KDevCreateFile::CreatedFile::STATUS_CANCELED; return result; } @@ -383,8 +383,8 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString selectedURL = dialog.url(); const FileType *selectedFileType = dialog.selectedType(); - if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & TDevProject::UsesTQMakeBuildSystem) ) { - result.status = TDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT; + if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) { + result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT; return result; } @@ -416,7 +416,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString } if (!created) { - result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED; + result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED; return result; } @@ -425,7 +425,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString // work out the path relative to the project directory // TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX ); TQString relToProj; - if( project()->options() & TDevProject::UsesTQMakeBuildSystem ) + if( project()->options() & KDevProject::UsesTQMakeBuildSystem ) { relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath ); project()->addFile(relToProj); @@ -445,7 +445,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString result.filename = fileName; result.dir = URLUtil::directory(fullPath); - result.status = TDevCreateFile::CreatedFile::STATUS_OK; + result.status = KDevCreateFile::CreatedFile::STATUS_OK; return result; } @@ -464,7 +464,7 @@ void FileCreatePart::slotInitialize( ) // read in which global templates are to be used for this project TQDomElement useGlobalTypes = - DomUtil::elementByPath(*projectDom(),"/tdevfilecreate/useglobaltypes"); + DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes"); for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) { @@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const { int version = 0; TQString filename; - TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "tdevfilecreate/template-info.xml"); + TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml"); for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it ) { TQDomDocument globalDom; -- cgit v1.2.3