diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /parts/appwizard | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts/appwizard')
| -rw-r--r-- | parts/appwizard/appwizarddlg.cpp | 10 | ||||
| -rw-r--r-- | parts/appwizard/importdlg.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 92632de0..67e97361 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -136,7 +136,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch ApplicationInfo *info = new ApplicationInfo; info->propValues = new PropertyLib::PropertyList(); - info->templateFile = KGlobal::dirs()->findResource("apptemplates", *it); + info->templateFile = TDEGlobal::dirs()->findResource("apptemplates", *it); info->templateName = (*it); KConfig templateConfig(info->templateFile); @@ -706,13 +706,13 @@ void AppWizardDialog::accept() if (!m_pCurrentAppInfo->finishCmd.isEmpty()) { - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setWorkingDirectory( m_pCurrentAppInfo->finishCmdDir ); proc.setUseShell( true ); proc << "cd" << m_pCurrentAppInfo->finishCmdDir << "&&"; proc << m_pCurrentAppInfo->finishCmd; kdDebug(9010) << "Executing:" << proc.args() << endl; - proc.start( KProcess::NotifyOnExit ); + proc.start( TDEProcess::NotifyOnExit ); if( !proc.isRunning() && !proc.normalExit() ) { kdDebug(9010) << "Couldn't execute: " << proc.args() << endl; @@ -889,7 +889,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item) TQMultiLineEdit *edit = new TQMultiLineEdit(this); edit->setWordWrap(TQTextEdit::NoWrap); - edit->setFont(KGlobalSettings::fixedFont()); + edit->setFont(TDEGlobalSettings::fixedFont()); if (it == l.end()) m_lastPage = edit; fileTemplate.edit = edit; @@ -1281,7 +1281,7 @@ TQDict<KDevLicense> AppWizardDialog::licenses() void AppWizardDialog::loadLicenses() { // kdDebug(9010) << "======================== Entering loadLicenses" << endl; - KStandardDirs* dirs = KGlobal::dirs(); + KStandardDirs* dirs = TDEGlobal::dirs(); dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "tdevelop/licenses/" ); TQStringList licNames = dirs->findAllResources( "licenses", TQString(), false, true ); diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 9a10f6d3..75a4487f 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -67,7 +67,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na TQStringList::ConstIterator it; for (it = importNames.begin(); it != importNames.end(); ++it) { - KConfig config(KGlobal::dirs()->findResource("appimports", *it)); + KConfig config(TDEGlobal::dirs()->findResource("appimports", *it)); config.setGroup("General"); TQString type = config.readEntry("Comment"); project_combo->insertItem(type); |