summaryrefslogtreecommitdiffstats
path: root/kspread/dialogs
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kspread/dialogs
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kspread/dialogs')
-rw-r--r--kspread/dialogs/kspread_dlg_formula.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc26
2 files changed, 14 insertions, 14 deletions
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 0f0a356c..3c654bb6 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -234,7 +234,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
}
// Add auto completion.
- searchFunct->setCompletionMode( KGlobalSettings::CompletionAuto );
+ searchFunct->setCompletionMode( TDEGlobalSettings::CompletionAuto );
searchFunct->setCompletionObject( &listFunct, true );
if( functions->currentItem() == -1 )
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 2d67b4e0..4895cac2 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -504,28 +504,28 @@ void miscParameters::slotTextComboChanged(const TQString &)
void miscParameters::initComboBox()
{
- KGlobalSettings::Completion tmpCompletion=KGlobalSettings::CompletionAuto;
+ TDEGlobalSettings::Completion tmpCompletion=TDEGlobalSettings::CompletionAuto;
if( config->hasGroup("Parameters" ))
{
config->setGroup( "Parameters" );
- tmpCompletion=( KGlobalSettings::Completion)config->readNumEntry( "Completion Mode" ,KGlobalSettings::CompletionAuto) ;
+ tmpCompletion=( TDEGlobalSettings::Completion)config->readNumEntry( "Completion Mode" ,TDEGlobalSettings::CompletionAuto) ;
config->writeEntry( "Completion Mode", (int)tmpCompletion);
}
switch(tmpCompletion )
{
- case KGlobalSettings::CompletionNone:
+ case TDEGlobalSettings::CompletionNone:
typeCompletion->setCurrentItem(0);
break;
- case KGlobalSettings::CompletionAuto:
+ case TDEGlobalSettings::CompletionAuto:
typeCompletion->setCurrentItem(3);
break;
- case KGlobalSettings::CompletionMan:
+ case TDEGlobalSettings::CompletionMan:
typeCompletion->setCurrentItem(4);
break;
- case KGlobalSettings::CompletionShell:
+ case TDEGlobalSettings::CompletionShell:
typeCompletion->setCurrentItem(1);
break;
- case KGlobalSettings::CompletionPopup:
+ case TDEGlobalSettings::CompletionPopup:
typeCompletion->setCurrentItem(2);
break;
default :
@@ -609,24 +609,24 @@ void miscParameters::apply()
}
config->setGroup( "Parameters" );
- KGlobalSettings::Completion tmpCompletion=KGlobalSettings::CompletionNone;
+ TDEGlobalSettings::Completion tmpCompletion=TDEGlobalSettings::CompletionNone;
switch(typeCompletion->currentItem())
{
case 0:
- tmpCompletion=KGlobalSettings::CompletionNone;
+ tmpCompletion=TDEGlobalSettings::CompletionNone;
break;
case 1:
- tmpCompletion=KGlobalSettings::CompletionShell;
+ tmpCompletion=TDEGlobalSettings::CompletionShell;
break;
case 2:
- tmpCompletion=KGlobalSettings::CompletionPopup;
+ tmpCompletion=TDEGlobalSettings::CompletionPopup;
break;
case 3:
- tmpCompletion=KGlobalSettings::CompletionAuto;
+ tmpCompletion=TDEGlobalSettings::CompletionAuto;
break;
case 4:
- tmpCompletion=KGlobalSettings::CompletionMan;
+ tmpCompletion=TDEGlobalSettings::CompletionMan;
break;
}