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/appwizarddlg.cpp | 66 +++++------ parts/appwizard/appwizarddlg.h | 5 +- parts/appwizard/appwizarddlgbase.ui | 130 ++++++++++----------- parts/appwizard/appwizardpart.cpp | 6 +- parts/appwizard/appwizardpart.h | 3 +- parts/appwizard/common/COPYING.LIB | 4 +- parts/appwizard/common/gnome/macros/autogen.sh | 2 +- parts/appwizard/common/gnome/macros/curses.m4 | 2 +- .../common/gnome/macros/gnome-fileutils.m4 | 2 +- parts/appwizard/common/gnome2/macros/autogen.sh | 2 +- parts/appwizard/common/gnome2/macros/curses.m4 | 2 +- parts/appwizard/common/incadmin/config.guess | 4 +- parts/appwizard/common/incadmin/install-sh | 2 +- parts/appwizard/common/incadmin/ltmain.sh | 20 ++-- parts/appwizard/common/incadmin/missing | 2 +- parts/appwizard/common/kde-index.docbook | 44 +++---- parts/appwizard/common/scons/admin/kde.py | 112 +++++++++--------- parts/appwizard/filepropspage.cpp | 8 +- parts/appwizard/filepropspage.h | 3 +- parts/appwizard/filepropspagebase.ui | 28 ++--- parts/appwizard/importdlg.cpp | 32 ++--- parts/appwizard/importdlg.h | 3 +- parts/appwizard/importdlgbase.ui | 42 +++---- parts/appwizard/kdevlicense.cpp | 30 ++--- parts/appwizard/profilesupport.cpp | 6 +- parts/appwizard/profilesupport.h | 2 +- parts/appwizard/vcs_form.ui | 18 +-- 27 files changed, 292 insertions(+), 288 deletions(-) (limited to 'parts/appwizard') diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 3d854ba0..4a54d195 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -90,8 +90,8 @@ #include "propeditor/propertylist.h" #include "propeditor/propertyeditor.h" -AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name) - : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0), +AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) + : AppWizardDialogBase(tqparent, name,true), m_pCurrentAppInfo(0), m_profileSupport(new ProfileSupport(part)) { kdDebug( 9010 ) << " ** AppWizardDialog::AppWizardDialog()" << endl; @@ -125,7 +125,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString::null, false, true); + TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString(), false, true); kdDebug(9010) << "Templates: " << endl; TQStringList categories; @@ -148,7 +148,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch info->fileTemplates = templateConfig.readEntry("FileTemplates"); info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration"); TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir); - destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); + destDir.tqreplace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); info->defaultDestDir = destDir; TQString category = templateConfig.readEntry("Category"); // format category to a unique status @@ -266,7 +266,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // Insert items into list view TQPtrListIterator ait(m_appsInfo); for (; ait.current(); ++ait) { - TQListViewItem *item = m_categoryMap.find(ait.current()->category); + TQListViewItem *item = m_categoryMap.tqfind(ait.current()->category); if (item) { item = new KListViewItem(item, ait.current()->name); @@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // How about names like "__" or "123" for project name? Are they legal? TQRegExpValidator *appname_edit_validator; appname_edit_validator = new TQRegExpValidator (appname_regexp, - appname_edit, + TQT_TQOBJECT(appname_edit), "AppNameValidator"); appname_edit->setValidator(appname_edit_validator); @@ -415,7 +415,7 @@ void AppWizardDialog::licenseChanged() for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { TQMultiLineEdit *edit = (*it).edit; - edit->setText( TQString::null ); + edit->setText( TQString() ); } } else { KDevLicense* lic = licenses()[ license_combo->currentText() ]; @@ -486,7 +486,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); + KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); templateArchive.close(); return; } @@ -509,7 +509,7 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() ); m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text()); m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); - m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); + m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) ); // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} // and unsurprisingly, KAboutData doesn't cover every imaginable case. @@ -517,7 +517,7 @@ void AppWizardDialog::accept() TQString license = license_combo->currentText(); if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || - license == "QPL" || license == "QPL_V1_0" ) + license == "TQPL" || license == "TQPL_V1_0" ) { m_pCurrentAppInfo->subMap.insert("LICENSE", license ); } @@ -543,7 +543,7 @@ void AppWizardDialog::accept() // This is too silly for words, but it's either this or reimplementing FileTemplate TQString tempProjectDomSource = "%1%2%3"; - tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() ); + tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() ); TQDomDocument tempProjectDom; tempProjectDom.setContent( tempProjectDomSource ); @@ -559,13 +559,13 @@ void AppWizardDialog::accept() temps.setEncoding(TQTextStream::UnicodeUTF8); temps << templateText; f.flush(); - TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() ); + TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() ); cleanUpSubstMap << templateName; m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) ); installFile file; file.source = tempFile->name(); - file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix ); + file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -585,8 +585,8 @@ void AppWizardDialog::accept() for( ; it != files.end(); ++it ) { installFile file; - file.source = TQString( "%{kdevelop}/template-common/%1" ).arg( *it ); - file.dest = TQString("%{dest}/%1").arg( *it ); + file.source = TQString( "%{kdevelop}/template-common/%1" ).tqarg( *it ); + file.dest = TQString("%{dest}/%1").tqarg( *it ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -630,9 +630,9 @@ void AppWizardDialog::accept() for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt ) { TQString escaped( mapIt.data() ); - escaped.replace( "&", "&" ); - escaped.replace( "<", "<" ); - escaped.replace( ">", ">" ); + escaped.tqreplace( "&", "&" ); + escaped.tqreplace( "<", "<" ); + escaped.tqreplace( ">", ">" ); m_pCurrentAppInfo->subMapXML.insert( mapIt.key(), escaped ); } @@ -645,7 +645,7 @@ void AppWizardDialog::accept() { if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) ) { - KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) ); + KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) ); return; } } @@ -664,7 +664,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) ); + KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) ); archive.close(); return; } @@ -682,7 +682,7 @@ void AppWizardDialog::accept() { if( !copyFile( *fileIt ) ) { - KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) ); return; } setPermissions(*fileIt); @@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin // ( where should we currently get that info from? ) if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) ) { - KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) ); return; } setPermissions(file, dest + "/" + file->name()); @@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item) if (it == l.end()) m_lastPage = edit; fileTemplate.edit = edit; - addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix)); + addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix)); m_fileTemplates.append(fileTemplate); } licenseChanged(); // to populate the template views @@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) TQDir newDir (dir); kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl; if (defPrjDir != newDir) { - if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ), + if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ), i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes) { config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/"); @@ -968,7 +968,7 @@ void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategor TQStringList::ConstIterator it; for (it = categories.begin(); it != categories.end(); ++it) { category = category + "/" + *it; - TQListViewItem *item = m_categoryMap.find(category); + TQListViewItem *item = m_categoryMap.tqfind(category); if (!item) { // not found, create it if (!pParentItem) pParentItem = new KListViewItem(templates_listview,*it); @@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration() { 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; } @@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration() DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap ); //save the selected vcs - KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText())); + KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText())); if (offers.count() == 1) { KService::Ptr service = offers.first(); @@ -1283,14 +1283,14 @@ void AppWizardDialog::loadLicenses() // kdDebug(9010) << "======================== Entering loadLicenses" << endl; KStandardDirs* dirs = KGlobal::dirs(); dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "kdevelop/licenses/" ); - TQStringList licNames = dirs->findAllResources( "licenses", TQString::null, false, true ); + TQStringList licNames = dirs->findAllResources( "licenses", TQString(), false, true ); TQStringList::Iterator it; for (it = licNames.begin(); it != licNames.end(); ++it) { TQString licPath( dirs->findResource( "licenses", *it ) ); kdDebug(9010) << "Loading license file: " << licPath << endl; - TQString licName = licPath.mid( licPath.findRev('/') + 1 ); + TQString licName = licPath.mid( licPath.tqfindRev('/') + 1 ); KDevLicense* lic = new KDevLicense( licName, licPath ); m_licenses.insert( licName, lic ); } @@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all) TQDictIterator dit(m_categoryMap); for (; dit.current(); ++dit) { - //checking whether all children are not visible + //checking whether all tqchildren are not visible kdDebug(9010) << "check: " << dit.current()->text(0) << endl; bool visible = false; TQListViewItemIterator it(dit.current()); @@ -1342,7 +1342,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) TQListViewItem *item = view->firstChild(); while (item) { - if (!m_categoryItems.contains(item)) + if (!m_categoryItems.tqcontains(item)) continue; checkAndHideItems(item); item = item->nextSibling(); @@ -1351,7 +1351,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) { - if (!m_categoryItems.contains(item)) + if (!m_categoryItems.tqcontains(item)) return !item->isVisible(); TQListViewItem *child = item->firstChild(); bool hide = true; @@ -1371,4 +1371,4 @@ bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) #include "appwizarddlg.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index a08206da..c63f66e1 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -121,9 +121,10 @@ struct AppWizardFileTemplate class AppWizardDialog : public AppWizardDialogBase { Q_OBJECT + TQ_OBJECT public: - AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); + AppWizardDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); ~AppWizardDialog(); TQString getProjectName() { return appname_edit->text(); } TQString getProjectLocation() { return finalLoc_label->text(); } @@ -206,4 +207,4 @@ public slots: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index f6d1fa49..ab8f7af0 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -1,6 +1,6 @@ AppWizardDialogBase - + AppWizardDialogBase @@ -15,7 +15,7 @@ Create New Project - + generalPage @@ -26,11 +26,11 @@ unnamed - + templates_tabwidget - + m_allProjectsPage @@ -86,7 +86,7 @@ - + showAll_box @@ -99,7 +99,7 @@ - + m_favouritesPage @@ -127,7 +127,7 @@ - + icon_label @@ -139,13 +139,13 @@ 0 - + 250 180 - + 250 180 @@ -160,13 +160,13 @@ true - + AlignCenter - + GroupBox1 @@ -177,15 +177,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + appname_label @@ -196,7 +196,7 @@ appname_edit - + location_label @@ -207,7 +207,7 @@ dest_edit - + TextLabel3 @@ -217,9 +217,9 @@ - + - layout1 + tqlayout1 @@ -251,7 +251,7 @@ - + finalLoc_label @@ -271,7 +271,7 @@ - + desc_textview @@ -286,13 +286,13 @@ 0 - + 250 0 - + 250 32767 @@ -313,7 +313,7 @@ - + WizardPage @@ -324,7 +324,7 @@ unnamed - + projectOptions @@ -343,15 +343,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + author_label @@ -362,7 +362,7 @@ author_edit - + email_label @@ -373,7 +373,7 @@ email_edit - + version_label @@ -386,9 +386,9 @@ - + - layout8 + tqlayout8 @@ -420,9 +420,9 @@ - + - layout7 + tqlayout7 @@ -444,7 +444,7 @@ 0.1 - + license_label @@ -455,7 +455,7 @@ license_combo - + Custom @@ -479,7 +479,7 @@ - + optionsGroup @@ -491,7 +491,7 @@ 1 - + 550 270 @@ -510,7 +510,7 @@ 0 - + custom_options @@ -542,69 +542,69 @@ templates_listview - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) AppWizardDialogBase - templatesTreeViewClicked(QListViewItem*) + templatesTreeViewClicked(TQListViewItem*) author_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() version_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() appname_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() appname_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase projectLocationChanged() dest_edit - urlSelected(const QString&) + urlSelected(const TQString&) AppWizardDialogBase - destButtonClicked(const QString&) + destButtonClicked(const TQString&) dest_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase projectLocationChanged() favourites_iconview - selectionChanged(QIconViewItem*) + selectionChanged(TQIconViewItem*) AppWizardDialogBase - favouritesIconViewClicked(QIconViewItem*) + favouritesIconViewClicked(TQIconViewItem*) templates_listview - contextMenuRequested(QListViewItem*,const QPoint&,int) + contextMenuRequested(TQListViewItem*,const TQPoint&,int) AppWizardDialogBase - templatesContextMenu(QListViewItem*,const QPoint&,int) + templatesContextMenu(TQListViewItem*,const TQPoint&,int) favourites_iconview - contextMenuRequested(QIconViewItem*,const QPoint&) + contextMenuRequested(TQIconViewItem*,const TQPoint&) AppWizardDialogBase - favouritesContextMenu(QIconViewItem*,const QPoint&) + favouritesContextMenu(TQIconViewItem*,const TQPoint&) favourites_iconview - contextMenuRequested(QIconViewItem*,const QPoint&) + contextMenuRequested(TQIconViewItem*,const TQPoint&) AppWizardDialogBase - favouritesContextMenu(QIconViewItem*,const QPoint&) + favouritesContextMenu(TQIconViewItem*,const TQPoint&) showAll_box @@ -614,7 +614,7 @@ dest_edit - returnPressed(const QString&) + returnPressed(const TQString&) AppWizardDialogBase projectLocationChanged() @@ -636,20 +636,20 @@ kiconview.h kurlrequester.h - + licenseChanged() - destButtonClicked( const QString & ) + destButtonClicked( const TQString & ) projectLocationChanged() projectNameChanged() textChanged() - templatesTreeViewClicked( QListViewItem * ) - favouritesIconViewClicked( QIconViewItem * ) - templatesContextMenu( QListViewItem *, const QPoint &, int ) - favouritesContextMenu( QIconViewItem *, const QPoint & ) + templatesTreeViewClicked( TQListViewItem * ) + favouritesIconViewClicked( TQIconViewItem * ) + templatesContextMenu( TQListViewItem *, const TQPoint &, int ) + favouritesContextMenu( TQIconViewItem *, const TQPoint & ) showTemplates(bool) - - - + + + klistview.h kiconview.h diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index 6b57b320..5e324b8a 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -34,8 +34,8 @@ #include #include -AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") +AppWizardPart::AppWizardPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(AppWizardFactory::info(), tqparent, name ? name : "AppWizardPart") { setInstance(AppWizardFactory::instance()); setXMLFile("kdevappwizard.rc"); @@ -95,4 +95,4 @@ void AppWizardPart::openFilesAfterGeneration() #include "appwizardpart.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 5b434ebf..66894790 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -24,9 +24,10 @@ class AppWizardDialog; class AppWizardPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - AppWizardPart( TQObject *parent, const char *name, const TQStringList & ); + AppWizardPart( TQObject *tqparent, const char *name, const TQStringList & ); ~AppWizardPart(); void openFilesAfterGeneration(const KURL::List urlsToOpen); diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB index 789c31ee..271a81c9 100644 --- a/parts/appwizard/common/COPYING.LIB +++ b/parts/appwizard/common/COPYING.LIB @@ -123,7 +123,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/parts/appwizard/common/gnome/macros/autogen.sh b/parts/appwizard/common/gnome/macros/autogen.sh index 70273913..33acff24 100644 --- a/parts/appwizard/common/gnome/macros/autogen.sh +++ b/parts/appwizard/common/gnome/macros/autogen.sh @@ -79,7 +79,7 @@ xlc ) am_opt=--include-deps;; esac -for coin in `find $srcdir -name configure.in -print` +for coin in `tqfind $srcdir -name configure.in -print` do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4 index 3dd4ffaa..21d90b01 100644 --- a/parts/appwizard/common/gnome/macros/curses.m4 +++ b/parts/appwizard/common/gnome/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 7c11a785..5c9f976f 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -38,7 +38,7 @@ fi list_mounted_fs= # If the getmntent function is available but not in the standard library, -# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). +# make sure LIBS tqcontains -lsun (on Irix4) or -lseq (on PTX). AC_FUNC_GETMNTENT # This test must precede the ones for getmntent because Unicos-9 is diff --git a/parts/appwizard/common/gnome2/macros/autogen.sh b/parts/appwizard/common/gnome2/macros/autogen.sh index ac9e0b68..9cd3c7fe 100755 --- a/parts/appwizard/common/gnome2/macros/autogen.sh +++ b/parts/appwizard/common/gnome2/macros/autogen.sh @@ -216,7 +216,7 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" +configure_files="`tqfind $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" for configure_ac in $configure_files; do if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then want_libtool=true diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4 index 5307e13d..d7beb9bf 100644 --- a/parts/appwizard/common/gnome2/macros/curses.m4 +++ b/parts/appwizard/common/gnome2/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index 1d9f4294..494d04c6 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -247,7 +247,7 @@ main: .prologue 1 .long 0x47e03d80 # implver \$0 lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 + .long 0x47e20c21 # atqmask \$2,\$1 lda \$16,\$Lformat mov \$0,\$17 not \$1,\$18 @@ -1135,7 +1135,7 @@ EOF echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to tqfind `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit 0 ;; diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh index 36f96f3e..f811e309 100755 --- a/parts/appwizard/common/incadmin/install-sh +++ b/parts/appwizard/common/incadmin/install-sh @@ -126,7 +126,7 @@ else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. +# if $src (and thus $dsttmp) tqcontains '*'. if [ -f "$src" ] || [ -d "$src" ] then diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3506ead3..8f29b4b9 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -1306,7 +1306,7 @@ func_mode_compile () elif test "$need_locks" = warn; then if test -f "$lockfile"; then $ECHO "\ -*** ERROR, $lockfile exists and contains: +*** ERROR, $lockfile exists and tqcontains: `cat $lockfile 2>/dev/null` This indicates that another process is trying to use the same @@ -1358,7 +1358,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile contains: +*** ERROR, $lockfile tqcontains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1407,7 +1407,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile contains: +*** ERROR, $lockfile tqcontains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1674,7 +1674,7 @@ func_mode_execute () dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'" fi fi ;; @@ -2062,7 +2062,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, + # the symlink we tqreplace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname do @@ -2684,7 +2684,7 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" @@ -3400,7 +3400,7 @@ EOF newargz = XMALLOC (char *, argc + 1); tmp_pathspec = find_executable (argv[0]); if (tmp_pathspec == NULL) - lt_fatal ("Couldn't find %s", argv[0]); + lt_fatal ("Couldn't tqfind %s", argv[0]); LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", tmp_pathspec)); @@ -4565,7 +4565,7 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. -model|-arch|-isysroot) @@ -7843,7 +7843,7 @@ EOF func_emit_cwrapperexe_src > $cwrappersource # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- + # because it tqcontains $host paths and files. If cross- # compiling, it, like the target executable, must be # executed on the $host or under an emulation environment. $opt_dry_run || { @@ -8339,7 +8339,7 @@ func_mode_uninstall () func_source $dir/$noexename fi - # note $name still contains .exe if it was in $file originally + # note $name still tqcontains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing index 2c025eb6..a311c33a 100755 --- a/parts/appwizard/common/incadmin/missing +++ b/parts/appwizard/common/incadmin/missing @@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | + tqfind . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | while read f; do touch "$f"; done ;; diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook index 036d8dba..b84a9430 100644 --- a/parts/appwizard/common/kde-index.docbook +++ b/parts/appwizard/common/kde-index.docbook @@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> - + XtUnmanageChildren Xt - Geometry Management @@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. --> XtUnmanageChildren -remove a list of children from a parent widget's managed +remove a list of tqchildren from a tqparent widget's managed list. -widgetsremoving -XtUnmanageChildren +widgetsremoving +XtUnmanageChildren @@ -277,16 +277,16 @@ list. 4 March 1996 -void XtUnmanageChildren(children, num_children) - WidgetList children; - Cardinal num_children; +void XtUnmanageChildren(tqchildren, num_tqchildren) + WidgetList tqchildren; + Cardinal num_tqchildren; - + Inputs -children +tqchildren Specifies an array of child widgets. Each child must be of @@ -295,40 +295,40 @@ class RectObj or any subclass thereof. -num_children +num_tqchildren -Specifies the number of elements in children. +Specifies the number of elements in tqchildren. - + Description XtUnmanageChildren() unmaps the specified widgets -and removes them from their parent's geometry management. +and removes them from their tqparent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its parent) may no longer have screen space allocated for +on its tqparent) may no longer have screen space allocated for them. -Each of the widgets in the children array must have -the same parent. +Each of the widgets in the tqchildren array must have +the same tqparent. See the “Algorithm” section below for full details of the widget unmanagement procedure. - + Usage Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with XtManageChildren(). -You can unmap a widget, but leave it under geometry +You can unmap a widget, but leave it under tqgeometry management by calling XtUnmapWidget(). You can destroy a widget's window without destroying the widget by calling XtUnrealizeWidget(). You can destroy a @@ -340,12 +340,12 @@ often more convenient to call XtUnmanageChild() several times than it is to declare and initialize an array of widgets to pass to XtUnmanageChildren(). Calling XtUnmanageChildren() is more efficient, however, -because it only calls the parent's change_managed() +because it only calls the tqparent's change_managed() method once. - + Algorithm XtUnmanageChildren() performs the following: @@ -374,11 +374,11 @@ by unmapping it. - + Structures The WidgetList type is simply an array of widgets: -typedef Widget *WidgetList; +typedef Widget *WidgetList; diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index bea63d4e..b0e51997 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -81,7 +81,7 @@ def detect_kde(env): env.Exit(1) env['QTDIR'] = qtdir.strip() - ## Find the necessary programs uic and moc + ## Find the necessary programs uic and tqmoc print "Checking for uic : ", uic = qtdir + "/bin/uic" if os.path.isfile(uic): @@ -99,33 +99,33 @@ def detect_kde(env): env.Exit(1) env['QT_UIC'] = uic - print "Checking for moc : ", - moc = qtdir + "/bin/moc" - if os.path.isfile(moc): - print GREEN + "moc was found as " + moc + NORMAL + print "Checking for tqmoc : ", + tqmoc = qtdir + "/bin/tqmoc" + if os.path.isfile(tqmoc): + print GREEN + "tqmoc was found as " + tqmoc + NORMAL else: - moc = os.popen("which moc 2>/dev/null").read().strip() - if len(moc): - print YELLOW + "moc was found as " + moc + NORMAL - elif os.path.isfile("/usr/share/qt3/bin/moc"): - moc = "/usr/share/qt3/bin/moc" - print YELLOW + "moc was found as " + moc + NORMAL + tqmoc = os.popen("which tqmoc 2>/dev/null").read().strip() + if len(tqmoc): + print YELLOW + "tqmoc was found as " + tqmoc + NORMAL + elif os.path.isfile("/usr/share/qt3/bin/tqmoc"): + tqmoc = "/usr/share/qt3/bin/tqmoc" + print YELLOW + "tqmoc was found as " + tqmoc + NORMAL else: - print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL + print RED + "tqmoc was not found - set QTDIR or put it in your PATH ?" + NORMAL env.Exit(1) - env['QT_MOC'] = moc + env['QT_TQMOC'] = tqmoc ## check for the qt and kde includes print "Checking for the qt includes : ", - if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"): + if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): # The user told where to look for and it looks valid print GREEN + "ok " + qtincludes + NORMAL else: - if os.path.isfile(qtdir + "/include/qlayout.h"): + if os.path.isfile(qtdir + "/include/qtqlayout.h"): # Automatic detection print GREEN + "ok " + qtdir + "/include/ " + NORMAL qtincludes = qtdir + "/include/" - elif os.path.isfile("/usr/include/qt3/qlayout.h"): + elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): # Debian probably print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL qtincludes = "/usr/include/qt3" @@ -157,8 +157,8 @@ def detect_kde(env): if not libdir: libdir=execprefix+"/lib"+libsuffix - subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir) - debian_fix = lambda x: x.replace('/usr/share', '${datadir}') + subst_vars = lambda x: x.tqreplace('${exec_prefix}', execprefix).tqreplace('${datadir}',datadir).tqreplace('${libdir}', libdir) + debian_fix = lambda x: x.tqreplace('/usr/share', '${datadir}') env['KDEBIN'] = subst_vars(os.popen('kde-config --install exe').read().strip()) env['KDEAPPS'] = subst_vars(os.popen('kde-config --install apps').read().strip()) env['KDEDATA'] = subst_vars(os.popen('kde-config --install data').read().strip()) @@ -204,7 +204,7 @@ def detect_kde(env): env['QTLIBPATH']=qtlibs def generate(env): - """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ + """"Set up the qt and kde environment and builders - the tqmoc part is difficult to understand """ if env['HELP']: print """ """+BOLD+"""*** KDE options *** @@ -270,7 +270,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env objBuilder.env = env - mocBuilderEnv = env.Moc.env + tqmocBuilderEnv = env.Moc.env env.Moc.env = env # make a deep copy for the result; MocH objects will be appended @@ -323,22 +323,22 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not h and qtdebug: print "scons: qt: no header for '%s'." % (str(cpp)) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file - moc_cpp = None + # h file with the Q_OBJECT macro found -> add .tqmoc or _tqmoc.cpp file + tqmoc_cpp = None - if env.has_key('NOMOCSCAN'): - moc_cpp = env.Moc(h) + if env.has_key('NOTQMOCSCAN'): + tqmoc_cpp = env.Moc(h) else: - reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' + reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.tqmoc("|>)' meta_object_search = re.compile(reg) if meta_object_search.search(cpp_contents): - moc_cpp = env.Moc(h) + tqmoc_cpp = env.Moc(h) else: - moc_cpp = env.Moccpp(h) - moc_o = objBuilder(moc_cpp) - out_sources.append(moc_o) + tqmoc_cpp = env.Moccpp(h) + tqmoc_o = objBuilder(tqmoc_cpp) + out_sources.append(tqmoc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) + print "scons: qt: found Q_OBJECT macro in '%s', tqmoc'ing to '%s'" % (str(h), str(tqmoc_cpp[0])) if cpp and q_object_search.search(cpp_contents): print "error, bksys cannot handle cpp files with Q_OBJECT classes" @@ -347,7 +347,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv - env.Moc.env = mocBuilderEnv + env.Moc.env = tqmocBuilderEnv return (target, out_sources) @@ -368,8 +368,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ('QTDIR', 'root of qt directory'), ('QTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), - ('QT_UIC', 'moc directory'), - ('QT_MOC', 'moc executable command'), + ('QT_UIC', 'tqmoc directory'), + ('QT_TQMOC', 'tqmoc executable command'), ('QTPLUGINS', 'uic executable command'), ('KDEDIR', 'root of kde directory'), ('KDELIBPATH', 'path to the kde libs'), @@ -412,8 +412,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' - env['QT_MOCHPREFIX'] = '' - env['QT_MOCHSUFFIX'] = '.moc' + env['QT_TQMOCHPREFIX'] = '' + env['QT_TQMOCHSUFFIX'] = '.tqmoc' env['KDE_KCFG_IMPLPREFIX'] = '' env['KDE_KCFG_IMPL_HSUFFIX'] = '.h' env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp' @@ -424,10 +424,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## ui file processing def uic_processing(target, source, env): inc_kde = '#include \n#include \n' - inc_moc = '#include "%s"\n' % target[2].name + inc_tqmoc = '#include "%s"\n' % target[2].name comp_h = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path) comp_c = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path) - comp_moc = '$QT_MOC -o %s %s' % (target[2].path, target[0].path) + comp_tqmoc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path) ret = env.Execute(comp_h) if ret: @@ -442,10 +442,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return ret dest = open( target[1].path, "a" ) - dest.write(inc_moc) + dest.write(inc_tqmoc) dest.close() - ret = env.Execute( comp_moc ) + ret = env.Execute( comp_tqmoc ) return ret def uicEmitter(target, source, env): @@ -459,10 +459,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env.subst('$QT_UICIMPLPREFIX'), env.subst('$QT_UICIMPLSUFFIX'))) if len(target) < 3: - # third target is .moc file + # third target is .tqmoc file target.append(adjustixes(bs, - env.subst('$QT_MOCHPREFIX'), - env.subst('$QT_MOCHSUFFIX'))) + env.subst('$QT_TQMOCHPREFIX'), + env.subst('$QT_TQMOCHSUFFIX'))) return target, source UIC_BUILDER = Builder( @@ -471,17 +471,17 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt suffix = '.h', src_suffix = '.ui') - ## moc file processing - env['QT_MOCCOM'] = ('$QT_MOC -o ${TARGETS[0]} $SOURCE') + ## tqmoc file processing + env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE') - MOC_BUILDER = Builder( - action = '$QT_MOCCOM', - suffix = '.moc', + TQMOC_BUILDER = Builder( + action = '$QT_TQMOCCOM', + suffix = '.tqmoc', src_suffix = '.h') - MOCCPP_BUILDER = Builder( - action = '$QT_MOCCOM', - suffix = '_moc.cpp', + TQMOCCPP_BUILDER = Builder( + action = '$QT_TQMOCCOM', + suffix = '_tqmoc.cpp', src_suffix = '.h') ## kcfg file processing @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): @@ -576,8 +576,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## register the builders env['BUILDERS']['Uic'] = UIC_BUILDER - env['BUILDERS']['Moc'] = MOC_BUILDER - env['BUILDERS']['Moccpp'] = MOCCPP_BUILDER + env['BUILDERS']['Moc'] = TQMOC_BUILDER + env['BUILDERS']['Moccpp'] = TQMOCCPP_BUILDER env['BUILDERS']['Dcop'] = DCOP_BUILDER env['BUILDERS']['Kcfg'] = KCFG_BUILDER env['BUILDERS']['LaFile'] = LA_BUILDER @@ -596,7 +596,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt static_obj.src_builder.append('Transfiles') shared_obj.src_builder.append('Transfiles') - ## Find the files to moc, dcop, and link against kde and qt + ## Find the files to tqmoc, dcop, and link against kde and qt env.AppendUnique(PROGEMITTER = [MetasourcesStatic], SHLIBEMITTER=[MetasourcesShared], LIBEMITTER =[MetasourcesStatic]) ## Handy helpers for building kde programs @@ -631,9 +631,9 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if ext in skel_ext: lenv.Dcop(bs+'.h') src.append(bs+'_skel.cpp') - elif ext == ".moch": + elif ext == ".tqmoch": lenv.Moccpp(bs+'.h') - src.append(bs+'_moc.cpp') + src.append(bs+'_tqmoc.cpp') else: src.append(file) diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp index e7436d04..1ec0b6df 100644 --- a/parts/appwizard/filepropspage.cpp +++ b/parts/appwizard/filepropspage.cpp @@ -7,11 +7,11 @@ #include /* - * Constructs a FilePropsPage which is a child of 'parent', with the + * Constructs a FilePropsPage which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) - : FilePropsPageBase( parent, name, fl ){ +FilePropsPage::FilePropsPage( TQWidget* tqparent, const char* name, WFlags fl ) + : FilePropsPageBase( tqparent, name, fl ){ m_props = new TQPtrList; m_current_class = 9999; // no current } @@ -21,7 +21,7 @@ FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) */ FilePropsPage::~FilePropsPage() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index a0c923ed..adb8f758 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -20,9 +20,10 @@ class ClassFileProp { class FilePropsPage : public FilePropsPageBase { Q_OBJECT + TQ_OBJECT public: - FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + FilePropsPage( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~FilePropsPage(); void setClassFileProps(TQPtrList props,bool different_header_impl=true); TQPtrList getClassFileProps(); diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index 2137d685..844e889f 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -1,6 +1,6 @@ FilePropsPageBase - + Form1 @@ -16,7 +16,7 @@ unnamed - + GroupBox7 @@ -27,7 +27,7 @@ unnamed - + TextLabel1_2 @@ -40,7 +40,7 @@ classname_edit - + TextLabel2_2 @@ -58,7 +58,7 @@ headerfile_edit - + implfile_label @@ -66,7 +66,7 @@ Implementation file: - + headerfile_label @@ -81,7 +81,7 @@ - + TextLabel5 @@ -89,7 +89,7 @@ Classes: - + TextLabel6 @@ -97,7 +97,7 @@ Description: - + classes_listbox @@ -110,7 +110,7 @@ - + desc_textview @@ -153,12 +153,12 @@ kdialog.h - + slotSelectionChanged() slotClassnameChanged(const QString&) - - - + + + klineedit.h klineedit.h 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; } diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index 35772133..aa7721e3 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -28,9 +28,10 @@ struct InfrastructureCmd{ class ImportDialog : public ImportDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); + ImportDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ImportDialog(); protected: diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index 101c8c58..134d7c51 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -1,6 +1,6 @@ ImportDialogBase - + import_dialog @@ -19,7 +19,7 @@ unnamed - + dir_label @@ -30,7 +30,7 @@ urlinput_edit - + vcsCombo @@ -46,7 +46,7 @@ - + fetchModuleButton @@ -68,7 +68,7 @@ false - + textLabel1 @@ -82,7 +82,7 @@ vcsCombo - + name_label @@ -106,7 +106,7 @@ - + Layout1 @@ -127,14 +127,14 @@ Expanding - + 20 20 - + ok_button @@ -145,7 +145,7 @@ true - + cancel_button @@ -155,7 +155,7 @@ - + project_combo @@ -168,7 +168,7 @@ - + project_label @@ -208,14 +208,14 @@ Expanding - + 20 20 - + TextLabel5 @@ -276,14 +276,14 @@ will be the author, everything between Minimum - + 20 20 - + author_label @@ -294,7 +294,7 @@ will be the author, everything between author_edit - + infrastructureBox @@ -349,14 +349,14 @@ will be the author, everything between kdialog.h - + dirButtonClicked() dirChanged() projectTypeChanged(const QString &) projectTypeChanged(int) - - - + + + kurlrequester.h klineedit.h diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp index 5e189422..688c3177 100644 --- a/parts/appwizard/kdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const strFill + " * $EMAIL$ *\n" + strFill + " * *\n"; -// str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67); +// str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67); TQStringList::Iterator it; for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it ) { - str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 ); + str += TQString( "%1 * %2 *\n").tqarg( strFill ).tqarg( *it, -69 ); } str += strFill + " ***************************************************************************/\n"; @@ -87,28 +87,28 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const return str; case KDevFile::PascalStyle: - str.replace(TQRegExp("/\\**\n \\*"), "{\n "); - str.replace(TQRegExp("\\*\n \\*"), " \n "); - str.replace(TQRegExp(" *\\**/\n"), "}\n"); + str.tqreplace(TQRegExp("/\\**\n \\*"), "{\n "); + str.tqreplace(TQRegExp("\\*\n \\*"), " \n "); + str.tqreplace(TQRegExp(" *\\**/\n"), "}\n"); return str; case KDevFile::AdaStyle: - str.replace(TQRegExp("/\\*"), "--"); - str.replace(TQRegExp(" \\*"), "--"); - str.replace(TQRegExp("\\*/"), "*"); + str.tqreplace(TQRegExp("/\\*"), "--"); + str.tqreplace(TQRegExp(" \\*"), "--"); + str.tqreplace(TQRegExp("\\*/"), "*"); return str; case KDevFile::BashStyle: - str.replace(TQRegExp("\\*|/"), "#"); - str.replace(TQRegExp("\n ##"), "\n##"); - str.replace(TQRegExp("\n #"), "\n# "); + str.tqreplace(TQRegExp("\\*|/"), "#"); + str.tqreplace(TQRegExp("\n ##"), "\n##"); + str.tqreplace(TQRegExp("\n #"), "\n# "); return str; case KDevFile::XMLStyle: - str.replace(TQRegExp("/\\*"), "\n"); - str.replace(TQRegExp("\\*"), "_"); + str.tqreplace(TQRegExp("/\\*"), "\n"); + str.tqreplace(TQRegExp("\\*"), "_"); return str; } diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 084156f5..8ae4d85e 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -26,9 +26,9 @@ #include -ProfileSupport::ProfileSupport(KDevPlugin *parent) +ProfileSupport::ProfileSupport(KDevPlugin *tqparent) { - KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard"); + KURL::List resources = tqparent->pluginController()->profileResourcesRecursive("*.appwizard"); for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it) { @@ -40,5 +40,5 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent) bool ProfileSupport::isInTemplateList(const TQString &templateUrl) { - return m_templateList.contains(TQFileInfo(templateUrl).baseName()); + return m_templateList.tqcontains(TQFileInfo(templateUrl).baseName()); } diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h index b18a9620..bc98d981 100644 --- a/parts/appwizard/profilesupport.h +++ b/parts/appwizard/profilesupport.h @@ -24,7 +24,7 @@ class ProfileSupport{ public: - ProfileSupport(KDevPlugin *parent); + ProfileSupport(KDevPlugin *tqparent); bool isInTemplateList(const TQString &templateUrl); private: diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui index 27075a88..a8433bbf 100644 --- a/parts/appwizard/vcs_form.ui +++ b/parts/appwizard/vcs_form.ui @@ -1,6 +1,6 @@ VcsForm - + VcsForm @@ -19,11 +19,11 @@ unnamed - + stack - + page @@ -32,7 +32,7 @@ - + textLabel1 @@ -43,7 +43,7 @@ combo - + combo @@ -58,7 +58,7 @@ Expanding - + 110 20 @@ -76,9 +76,9 @@ - qwidgetstack.h + tqwidgetstack.h kdialog.h - - + + -- cgit v1.2.3