summaryrefslogtreecommitdiffstats
path: root/kspread
diff options
context:
space:
mode:
Diffstat (limited to 'kspread')
-rw-r--r--kspread/dialogs/kspread_dlg_formula.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc26
-rw-r--r--kspread/formula.cc2
-rw-r--r--kspread/kspread_canvas.cc6
-rw-r--r--kspread/kspread_doc.cc8
-rw-r--r--kspread/kspread_doc.h4
-rw-r--r--kspread/kspread_editors.cc8
-rw-r--r--kspread/kspread_editors.h2
-rw-r--r--kspread/kspread_factory.cc2
-rw-r--r--kspread/kspread_functions_engineering.cc48
-rw-r--r--kspread/kspread_style.cc8
-rw-r--r--kspread/kspread_util.cc6
-rw-r--r--kspread/kspread_view.cc2
-rw-r--r--kspread/plugins/calculator/kcalc.cpp6
-rw-r--r--kspread/plugins/calculator/main.cpp2
15 files changed, 66 insertions, 66 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;
}
diff --git a/kspread/formula.cc b/kspread/formula.cc
index fbcf8c0e..45cf8d02 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -1191,7 +1191,7 @@ Value Formula::eval() const
}
else
{
- parser = new ValueParser( KGlobal::locale() );
+ parser = new ValueParser( TDEGlobal::locale() );
converter = new ValueConverter( parser );
calc = new ValueCalc( converter );
}
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 4ebfffea..51d561cd 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -2762,7 +2762,7 @@ void Canvas::keyPressEvent ( TQKeyEvent * _ev )
(_ev->key() != Key_Home) &&
(_ev->key() != Key_Enter) &&
(_ev->key() != Key_Return) &&
- (_ev->key() != KGlobalSettings::contextMenuKey()))
+ (_ev->key() != TDEGlobalSettings::contextMenuKey()))
{
TQWidget::keyPressEvent( _ev );
return;
@@ -2773,7 +2773,7 @@ void Canvas::keyPressEvent ( TQKeyEvent * _ev )
_ev->accept();
d->view->doc()->emitBeginOperation(false);
- if ( _ev->key() == KGlobalSettings::contextMenuKey() ) {
+ if ( _ev->key() == TDEGlobalSettings::contextMenuKey() ) {
int row = markerRow();
int col = markerColumn();
KoPoint kop(sheet->columnPos(col, this), sheet->rowPos(row, this));
@@ -5738,7 +5738,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
TQString tmpSize;
if ( m_iResizePos != x )
tmpSize = i18n("Width: %1 %2")
- .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
+ .arg( TDEGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
m_pView->doc()->unit() )))
.arg( m_pView->doc()->unitName() );
else
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 461173a4..983e75ef 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -144,7 +144,7 @@ public:
bool showTabBar:1;
bool showFormulaBar:1;
bool showError:1;
- KGlobalSettings::Completion completionMode;
+ TDEGlobalSettings::Completion completionMode;
KSpread::MoveTo moveTo;
MethodOfCalc calcMethod;
bool delayCalculation:1;
@@ -239,7 +239,7 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons
d->showError = false;
d->calcMethod = SumOfNumber;
d->moveTo = KSpread::Bottom;
- d->completionMode = KGlobalSettings::CompletionAuto;
+ d->completionMode = TDEGlobalSettings::CompletionAuto;
d->spellConfig = 0;
d->dontCheckUpperWord = false;
d->dontCheckTitleCase = false;
@@ -1349,7 +1349,7 @@ bool Doc::showHorizontalScrollBar()const
return d->horizontalScrollBar;
}
-KGlobalSettings::Completion Doc::completionMode( ) const
+TDEGlobalSettings::Completion Doc::completionMode( ) const
{
return d->completionMode;
}
@@ -1384,7 +1384,7 @@ TQColor Doc::gridColor() const
return d->gridColor;
}
-void Doc::setCompletionMode( KGlobalSettings::Completion complMode)
+void Doc::setCompletionMode( TDEGlobalSettings::Completion complMode)
{
d->completionMode= complMode;
}
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index 08656b50..e0455278 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -377,8 +377,8 @@ public:
* completion mode
*/
- KGlobalSettings::Completion completionMode( )const ;
- void setCompletionMode( KGlobalSettings::Completion _complMode);
+ TDEGlobalSettings::Completion completionMode( )const ;
+ void setCompletionMode( TDEGlobalSettings::Completion _complMode);
KSpread::MoveTo getMoveToValue()const;
void setMoveToValue(KSpread::MoveTo _moveTo) ;
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 7f0fa282..1edef10d 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -531,7 +531,7 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents,
//TODO - Custom KTextEdit class which supports text completion
/*
d->textEdit->setFrame( false );
- d->textEdit->setCompletionMode((KGlobalSettings::Completion)canvas()->view()->doc()->completionMode() );
+ d->textEdit->setCompletionMode((TDEGlobalSettings::Completion)canvas()->view()->doc()->completionMode() );
d->textEdit->setCompletionObject( &canvas()->view()->doc()->completion(),true );
*/
setFocusProxy( d->textEdit );
@@ -540,7 +540,7 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents,
connect( d->textEdit, TQT_SIGNAL( cursorPositionChanged(TQTextCursor*) ), this, TQT_SLOT (slotTextCursorChanged(TQTextCursor*)));
connect( d->textEdit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) );
-// connect( d->textEdit, TQT_SIGNAL(completionModeChanged( KGlobalSettings::Completion )),this,TQT_SLOT (slotCompletionModeChanged(KGlobalSettings::Completion)));
+// connect( d->textEdit, TQT_SIGNAL(completionModeChanged( TDEGlobalSettings::Completion )),this,TQT_SLOT (slotCompletionModeChanged(TDEGlobalSettings::Completion)));
// A choose should always start at the edited cell
// canvas()->setChooseMarkerRow( canvas()->markerRow() );
@@ -840,7 +840,7 @@ void CellEditor::setEditorFont(TQFont const & font, bool updateSize)
}
}
-void CellEditor::slotCompletionModeChanged(KGlobalSettings::Completion _completion)
+void CellEditor::slotCompletionModeChanged(TDEGlobalSettings::Completion _completion)
{
canvas()->view()->doc()->setCompletionMode( _completion );
}
@@ -1304,7 +1304,7 @@ LocationEditWidget::LocationEditWidget( TQWidget * _parent,
m_pView(_view)
{
setCompletionObject( &completionList,true );
- setCompletionMode(KGlobalSettings::CompletionAuto );
+ setCompletionMode(TDEGlobalSettings::CompletionAuto );
}
void LocationEditWidget::addCompletionItem( const TQString &_item )
diff --git a/kspread/kspread_editors.h b/kspread/kspread_editors.h
index fa21452f..b0dff610 100644
--- a/kspread/kspread_editors.h
+++ b/kspread/kspread_editors.h
@@ -214,7 +214,7 @@ public:
private slots:
void slotTextChanged();
- void slotCompletionModeChanged(KGlobalSettings::Completion _completion);
+ void slotCompletionModeChanged(TDEGlobalSettings::Completion _completion);
void slotCursorPositionChanged(int para,int pos);
void slotTextCursorChanged(TQTextCursor*);
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc
index 1258b9a4..63f393a7 100644
--- a/kspread/kspread_factory.cc
+++ b/kspread/kspread_factory.cc
@@ -36,7 +36,7 @@ Factory::Factory( TQObject* parent, const char* name )
: KoFactory( parent, name )
{
//kdDebug(36001) << "Factory::Factory()" << endl;
- // Create our instance, so that it becomes KGlobal::instance if the
+ // Create our instance, so that it becomes TDEGlobal::instance if the
// main app is KSpread.
(void)global();
(void)dcopObject();
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc
index 8ae0bf2f..ddcda561 100644
--- a/kspread/kspread_functions_engineering.cc
+++ b/kspread/kspread_functions_engineering.cc
@@ -718,16 +718,16 @@ static TQString func_create_complex( double real,double imag )
TQString tmp,tmp2;
if(imag ==0)
{
- return KGlobal::locale()->formatNumber( real);
+ return TDEGlobal::locale()->formatNumber( real);
}
if(real!=0)
- tmp=KGlobal::locale()->formatNumber(real);
+ tmp=TDEGlobal::locale()->formatNumber(real);
else
- return KGlobal::locale()->formatNumber(imag)+"i";
+ return TDEGlobal::locale()->formatNumber(imag)+"i";
if (imag >0)
- tmp=tmp+"+"+KGlobal::locale()->formatNumber(imag)+"i";
+ tmp=tmp+"+"+TDEGlobal::locale()->formatNumber(imag)+"i";
else
- tmp=tmp+KGlobal::locale()->formatNumber(imag)+"i";
+ tmp=tmp+TDEGlobal::locale()->formatNumber(imag)+"i";
return tmp;
}
@@ -741,7 +741,7 @@ Value func_complex (valVector args, ValueCalc *calc, FuncExtra *)
double im = calc->conv()->asFloat (args[1]).asFloat ();
TQString tmp=func_create_complex (re, im);
bool ok;
- double result = KGlobal::locale()->readNumber(tmp, &ok);
+ double result = TDEGlobal::locale()->readNumber(tmp, &ok);
if (ok)
return Value (result);
return Value (tmp);
@@ -779,7 +779,7 @@ else if( tmp.length()==2 )
else if(tmp[0].isDigit())
{ //5i
ok=true;
- return KGlobal::locale()->readNumber(tmp.left(1));
+ return TDEGlobal::locale()->readNumber(tmp.left(1));
}
else
{
@@ -805,7 +805,7 @@ else
else
{
tmpStr=tmp.mid(pos2,(pos1-pos2));
- val=KGlobal::locale()->readNumber(tmpStr, &ok);
+ val=TDEGlobal::locale()->readNumber(tmpStr, &ok);
if(!ok)
val=0;
return val;
@@ -821,7 +821,7 @@ else
else
{
tmpStr=tmp.mid(pos2,(pos1-pos2));
- val=KGlobal::locale()->readNumber(tmpStr, &ok);
+ val=TDEGlobal::locale()->readNumber(tmpStr, &ok);
if(!ok)
val=0;
return val;
@@ -830,7 +830,7 @@ else
else
{//15.55i
tmpStr=tmp.left(pos1);
- val=KGlobal::locale()->readNumber(tmpStr, &ok);
+ val=TDEGlobal::locale()->readNumber(tmpStr, &ok);
if(!ok)
val=0;
return val;
@@ -861,7 +861,7 @@ TQString tmp=str;
TQString tmpStr;
if((pos1=tmp.find('i'))==-1)
{ //12.5
- val=KGlobal::locale()->readNumber(tmp, &ok);
+ val=TDEGlobal::locale()->readNumber(tmp, &ok);
if(!ok)
val=0;
return val;
@@ -871,7 +871,7 @@ else
if((pos2=tmp.findRev('-'))!=-1 && pos2!=0)
{
tmpStr=tmp.left(pos2);
- val=KGlobal::locale()->readNumber(tmpStr, &ok);
+ val=TDEGlobal::locale()->readNumber(tmpStr, &ok);
if(!ok)
val=0;
return val;
@@ -879,7 +879,7 @@ else
else if((pos2=tmp.findRev('+'))!=-1)
{
tmpStr=tmp.left(pos2);
- val=KGlobal::locale()->readNumber(tmpStr, &ok);
+ val=TDEGlobal::locale()->readNumber(tmpStr, &ok);
if(!ok)
val=0;
return val;
@@ -959,7 +959,7 @@ Value func_imsum (valVector args, ValueCalc *calc, FuncExtra *)
bool ok;
TQString res = calc->conv()->asString (result).asString();
- double val=KGlobal::locale()->readNumber(res, &ok);
+ double val=TDEGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
return Value (result);
@@ -973,7 +973,7 @@ Value func_imsub (valVector args, ValueCalc *calc, FuncExtra *)
bool ok;
TQString res = calc->conv()->asString (result).asString();
- double val=KGlobal::locale()->readNumber(res, &ok);
+ double val=TDEGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
return Value (result);
@@ -987,7 +987,7 @@ Value func_improduct (valVector args, ValueCalc *calc, FuncExtra *)
bool ok;
TQString res = calc->conv()->asString (result).asString();
- double val=KGlobal::locale()->readNumber(res, &ok);
+ double val=TDEGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
return Value (result);
@@ -1001,7 +1001,7 @@ Value func_imdiv (valVector args, ValueCalc *calc, FuncExtra *)
bool ok;
TQString res = calc->conv()->asString (result).asString();
- double val=KGlobal::locale()->readNumber(res, &ok);
+ double val=TDEGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
return Value (result);
@@ -1021,7 +1021,7 @@ Value func_imconjugate (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real,-imag);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1079,7 +1079,7 @@ Value func_imcos (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real_res,-imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1103,7 +1103,7 @@ Value func_imsin (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real_res,imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1127,7 +1127,7 @@ Value func_imln (valVector args, ValueCalc *calc, FuncExtra *)
double imag_res=atan(imag/real);
tmp=func_create_complex(real_res,imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1151,7 +1151,7 @@ Value func_imexp (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real_res,imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1177,7 +1177,7 @@ Value func_imsqrt (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real_res,imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
@@ -1205,7 +1205,7 @@ Value func_impower (valVector args, ValueCalc *calc, FuncExtra *)
tmp=func_create_complex(real_res,imag_res);
- double result=KGlobal::locale()->readNumber(tmp, &ok);
+ double result=TDEGlobal::locale()->readNumber(tmp, &ok);
if(ok)
return Value (result);
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index dc8b7add..f8ac8158 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -586,8 +586,8 @@ static TQString convertDateFormat( const TQString& date )
FormatType Style::dateType( const TQString &_format )
{
- const TQString dateFormatShort = convertDateFormat( KGlobal::locale()->dateFormatShort() );
- const TQString dateFormat = convertDateFormat( KGlobal::locale()->dateFormat() );
+ const TQString dateFormatShort = convertDateFormat( TDEGlobal::locale()->dateFormatShort() );
+ const TQString dateFormat = convertDateFormat( TDEGlobal::locale()->dateFormat() );
if ( _format == "dd-MMM-yy" )
return date_format1;
@@ -899,11 +899,11 @@ TQString Style::saveOasisStyleNumericDate( KoGenStyles&mainStyles, FormatType _s
{
//TODO fixme use locale of kspread and not kglobal
case ShortDate_format:
- format = KGlobal::locale()->dateFormatShort();
+ format = TDEGlobal::locale()->dateFormatShort();
locale = true;
break;
case TextDate_format:
- format = KGlobal::locale()->dateFormat();
+ format = TDEGlobal::locale()->dateFormat();
locale = true;
break;
case date_format1:
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc
index ab6871a5..81761bad 100644
--- a/kspread/kspread_util.cc
+++ b/kspread/kspread_util.cc
@@ -114,7 +114,7 @@ TQDomElement KSpread::util_createElement( const TQString & tagName, const TQFont
e.setAttribute( "underline", "yes" );
if ( font.strikeOut() )
e.setAttribute( "strikeout", "yes" );
- //e.setAttribute( "charset", KGlobal::charsets()->name( font ) );
+ //e.setAttribute( "charset", TDEGlobal::charsets()->name( font ) );
return e;
}
@@ -157,11 +157,11 @@ TQFont KSpread::util_toFont( TQDomElement & element )
/* Uncomment when charset is added to kspread_dlg_layout
+ save a document-global charset
if ( element.hasAttribute( "charset" ) )
- KGlobal::charsets()->setTQFont( f, element.attribute("charset") );
+ TDEGlobal::charsets()->setTQFont( f, element.attribute("charset") );
else
*/
// ######## Not needed anymore in 3.0?
- //KGlobal::charsets()->setTQFont( f, KGlobal::locale()->charset() );
+ //TDEGlobal::charsets()->setTQFont( f, TDEGlobal::locale()->charset() );
return f;
}
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 77400ea0..cb86e1a0 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -2110,7 +2110,7 @@ void View::initConfig()
doc()->setShowColHeader(config->readBoolEntry("Column Header",true));
doc()->setShowRowHeader(config->readBoolEntry("Row Header",true));
if ( !doc()->configLoadFromFile() )
- doc()->setCompletionMode((KGlobalSettings::Completion)config->readNumEntry("Completion Mode",(int)(KGlobalSettings::CompletionAuto)));
+ doc()->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("Completion Mode",(int)(TDEGlobalSettings::CompletionAuto)));
doc()->setMoveToValue((KSpread::MoveTo)config->readNumEntry("Move",(int)(Bottom)));
doc()->setIndentValue( config->readDoubleNumEntry( "Indent", 10.0 ) );
doc()->setTypeOfCalc((MethodOfCalc)config->readNumEntry("Method of Calc",(int)(SumOfNumber)));
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index c3ba18ac..eb654706 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -58,7 +58,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
readSettings();
- TQFont buttonfont( KGlobalSettings::generalFont() );
+ TQFont buttonfont( TDEGlobalSettings::generalFont() );
buttonfont.setStyleStrategy( TQFont::PreferAntialias );
// Set the window caption/title
@@ -1587,7 +1587,7 @@ void TQtCalculator::readSettings()
TQColor tmpC(189, 255, 180);
TQColor blackC(0,0,0);
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("CalcPlugin");
kcalcdefaults.forecolor = config->readColorEntry("ForeColor", &blackC);
kcalcdefaults.backcolor = config->readColorEntry("BackColor", &tmpC);
@@ -1606,7 +1606,7 @@ void TQtCalculator::readSettings()
void TQtCalculator::writeSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("CalcPlugin");
config->writeEntry("ForeColor",kcalcdefaults.forecolor);
diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp
index 48afebd7..5bab1541 100644
--- a/kspread/plugins/calculator/main.cpp
+++ b/kspread/plugins/calculator/main.cpp
@@ -83,7 +83,7 @@ Calculator::Calculator( View* parent, const char* name )
m_calc = 0;
m_view = parent;
- KGlobal::locale()->insertCatalogue("kspreadcalc_calc");
+ TDEGlobal::locale()->insertCatalogue("kspreadcalc_calc");
parent->installEventFilter( this );
(void)new KAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()),
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 04:51:53 +0000