diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /lib/kofficeui | |
| parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
| download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui')
| -rw-r--r-- | lib/kofficeui/KoTemplateChooseDia.cpp | 6 | ||||
| -rw-r--r-- | lib/kofficeui/KoTemplateCreateDia.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index d904fac0..991ffff8 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -403,7 +403,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou layout->addWidget(d->boxdescription, 1, 0 ); // config - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); int templateNum = grp.readNumEntry( "TemplateTab", -1 ); TQString templateName = grp.readPathEntry( "TemplateName" ); if ( templateName.isEmpty() && d->tree->defaultTemplate() ) @@ -504,7 +504,7 @@ void KoTemplateChooseDia::setupDialog() { TQGridLayout *maingrid=new TQGridLayout( d->m_mainwidget, 1, 1, 2, 6); - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); if (d->m_dialogType == Everything) { @@ -638,7 +638,7 @@ void KoTemplateChooseDia::slotOk() if (collectInfo()) { // Save it for the next time - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" }; if ( d->m_returnType <= Empty ) { diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index b82efbb6..3b4975f0 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -272,7 +272,7 @@ void KoTemplateCreateDia::slotOk() { tmpIcon=".icon/"+file+".png"; icon=iconDir+file+".png"; } - while ( KIO::NetAccess::exists( dest, true, this ) ); + while ( TDEIO::NetAccess::exists( dest, true, this ) ); } bool ignore = false; kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl; @@ -306,7 +306,7 @@ void KoTemplateCreateDia::slotOk() { if ( !ignore ) { // copy the template file - KIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); + TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); // save the picture if(d->m_default->isChecked() && !m_pixmap.isNull()) @@ -324,10 +324,10 @@ void KoTemplateCreateDia::slotOk() { if((*it).contains(dir)==0) { orig.setPath( (*it)+".directory" ); // Check if we can read the file - if( KIO::NetAccess::exists(orig, true, this) ) { + if( TDEIO::NetAccess::exists(orig, true, this) ) { dest.setPath( dir+"/.directory" ); // We copy the file with overwrite - KIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); + TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); ready=true; } } @@ -337,7 +337,7 @@ void KoTemplateCreateDia::slotOk() { if ( d->m_defaultTemplate->isChecked() ) { - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); grp.writeEntry( "LastReturnType", "Template" ); grp.writePathEntry( "FullTemplateName", dir + "/" + t->file() ); grp.writePathEntry( "AlwaysUseTemplate", dir + "/" + t->file() ); |