From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/appwizard/importdlg.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'parts/appwizard/importdlg.cpp') diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 9cb9838a..b2beb660 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -51,8 +51,8 @@ #include "misc.h" -ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name) - : ImportDialogBase(parent, name, true), m_part(part) +ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) + : ImportDialogBase(tqparent, name, true), m_part(part) { TQString author, email; AppWizardUtil::guessAuthorAndEmail(&author, &email); @@ -62,7 +62,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na urlinput_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - importNames = dirs->findAllResources("appimports", TQString::null, false, true); + importNames = dirs->findAllResources("appimports", TQString(), false, true); importNames.sort(); TQStringList::ConstIterator it; @@ -101,7 +101,7 @@ ImportDialog::~ImportDialog() void ImportDialog::slotProjectNameChanged( const TQString &_text ) { - ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) ); + ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().tqcontains( TQRegExp("\\s") ) ); } void ImportDialog::accept() @@ -151,7 +151,7 @@ void ImportDialog::accept() { KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .arg(errorLine).arg(errorCol).arg(errorMsg)); + .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); return; } @@ -204,9 +204,9 @@ void ImportDialog::accept() // // while (!srcstream.atEnd()) { // TQString line = srcstream.readLine(); -// line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName); -// line.replace(TQRegExp("\\$AUTHOR\\$"), author); -// line.replace(TQRegExp("\\$EMAIL\\$"), email); +// line.tqreplace(TQRegExp("\\$APPNAMELC\\$"), projectName); +// line.tqreplace(TQRegExp("\\$AUTHOR\\$"), author); +// line.tqreplace(TQRegExp("\\$EMAIL\\$"), email); // deststream << line << endl; // } // @@ -260,7 +260,7 @@ void ImportDialog::dirChanged() if (!dir.exists()) return; - if ( dirName.contains( TQRegExp("\\s") ) ) + if ( dirName.tqcontains( TQRegExp("\\s") ) ) { ok_button->setEnabled( false ); return; @@ -290,12 +290,12 @@ void ImportDialog::dirChanged() } // Remove any characters from the dirName that would be invalid in a project name - TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_")); + TQString projectName(dir.dirName().tqreplace(TQRegExp("[^a-zA-Z0-9_]"), "_")); // Set the project name name_edit->setText(projectName); - // QMake based? + // TQMake based? files = dir.entryList("*.pro"); if (!files.isEmpty()) { setProjectType("qtqmake"); @@ -339,7 +339,7 @@ void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) name_edit->setText(config.readEntry("project_name")); TQString legacyType = config.readEntry("project_type"); - if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType)) + if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").tqcontains(legacyType)) setProjectType("kde"); else if (legacyType == "normal_gnome") setProjectType("gnome"); @@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) TQFile configIn(dirName+"/configure.in"); TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ - cstream.setDevice(&configInIn); + cstream.setDevice(TQT_TQIODEVICE(&configInIn)); while (!cstream.atEnd()) { TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ @@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) } if (configIn.open(IO_ReadOnly)){ - cstream.setDevice(&configIn); + cstream.setDevice(TQT_TQIODEVICE(&configIn)); } else{ if (configAc.open(IO_ReadOnly)){ - cstream.setDevice(&configAc); + cstream.setDevice(TQT_TQIODEVICE(&configAc)); } else{ return; @@ -564,7 +564,7 @@ void ImportDialog::createProjectInfrastructure( ) TQDir dir (urlinput_edit->url()); TQStringList files = dir.entryList(cmd.existingPattern); if (!files.isEmpty()) { - if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No) + if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString(), i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No) return; } -- cgit v1.2.3