summaryrefslogtreecommitdiffstats
path: root/kig
diff options
context:
space:
mode:
Diffstat (limited to 'kig')
-rw-r--r--kig/ChangeLog2
-rw-r--r--kig/filters/native-filter.cc4
-rw-r--r--kig/kfile/kfile_kig.cpp2
-rw-r--r--kig/kig/kig.cpp4
-rw-r--r--kig/kig/kig_part.cpp8
-rw-r--r--kig/misc/common.cpp6
-rw-r--r--kig/misc/coordinate_system.cpp24
-rw-r--r--kig/scripting/newscriptwizard.cc2
8 files changed, 26 insertions, 26 deletions
diff --git a/kig/ChangeLog b/kig/ChangeLog
index 86c22fcf..8845e357 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -893,7 +893,7 @@
* Improve Kig embedded in Konqueror experience: make translations
and icons work by using the correct instanceName(), and using the
- iconLoader we get from our TDEInstance instead of from KGlobal ( so
+ iconLoader we get from our TDEInstance instead of from TDEGlobal ( so
that the kig specific dirs are checked for icons as well ).
2004-04-10 Dominique Devriese <devriese@kde.org>
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index a9bcc241..652e1096 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -120,7 +120,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
// kig file inside it...
iscompressed = true;
- TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" );
+ TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" );
if ( tempdir.isEmpty() )
KIG_FILTER_PARSE_ERROR;
@@ -688,7 +688,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
// the user wants to save a compressed file, so we have to save our kig
// file to a temp file and then compress it...
- TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" );
+ TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" );
if ( tempdir.isEmpty() )
return false;
diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp
index bd54a036..d44eb1fa 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/kfile/kfile_kig.cpp
@@ -62,7 +62,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
{
iscompressed = true;
- TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" );
+ TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" );
if ( tempdir.isEmpty() )
return false;
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 4b37b8e1..82beb27e 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -199,7 +199,7 @@ void Kig::optionsConfigureKeys()
void Kig::optionsConfigureToolbars()
{
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
// use the standard toolbar editor
KEditToolbar dlg(factory());
@@ -210,7 +210,7 @@ void Kig::optionsConfigureToolbars()
void Kig::applyNewToolbarConfig()
{
- applyMainWindowSettings(KGlobal::config(), "MainWindow");
+ applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
bool Kig::queryClose()
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 8ba6820c..128eaeed 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -701,7 +701,7 @@ void KigPart::setupMacroTypes()
// the user's saved macro types:
TQStringList dataFiles =
- KGlobal::dirs()->findAllResources("appdata", "kig-types/*.kigt",
+ TDEGlobal::dirs()->findAllResources("appdata", "kig-types/*.kigt",
true, false );
std::vector<Macro*> macros;
for ( TQStringList::iterator file = dataFiles.begin();
@@ -728,7 +728,7 @@ void KigPart::setupBuiltinMacros()
// builtin macro types ( we try to make the user think these are
// normal types )..
TQStringList builtinfiles =
- KGlobal::dirs()->findAllResources( "appdata", "builtin-macros/*.kigt", true, false );
+ TDEGlobal::dirs()->findAllResources( "appdata", "builtin-macros/*.kigt", true, false );
for ( TQStringList::iterator file = builtinfiles.begin();
file != builtinfiles.end(); ++file )
{
@@ -989,7 +989,7 @@ void KigPart::coordSystemChanged( int id )
void KigPart::saveTypes()
{
- TQString typesDir = KGlobal::dirs()->saveLocation( "appdata", "kig-types" );
+ TQString typesDir = TDEGlobal::dirs()->saveLocation( "appdata", "kig-types" );
if ( typesDir[ typesDir.length() - 1 ] != '/' )
typesDir += '/';
TQString typesFileWithPath = typesDir + typesFile;
@@ -1004,7 +1004,7 @@ void KigPart::saveTypes()
void KigPart::loadTypes()
{
- TQString typesDir = KGlobal::dirs()->saveLocation( "appdata", "kig-types" );
+ TQString typesDir = TDEGlobal::dirs()->saveLocation( "appdata", "kig-types" );
if ( typesDir[ typesDir.length() - 1 ] != '/' )
typesDir += '/';
TQString typesFileWithPath = typesDir + typesFile;
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index b41b9284..287bde1f 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -356,17 +356,17 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double
#endif
#if KDE_IS_VERSION( 3, 1, 90 )
TQString input = KInputDialog::getText(
- caption, label, KGlobal::locale()->formatNumber( value, decimals ),
+ caption, label, TDEGlobal::locale()->formatNumber( value, decimals ),
ok, parent, "getDoubleFromUserDialog", &vtor );
#else
TQString input =
KLineEditDlg::getText( caption, label,
- KGlobal::locale()->formatNumber( value, decimals ),
+ TDEGlobal::locale()->formatNumber( value, decimals ),
ok, parent, &vtor );
#endif
bool myok = true;
- double ret = KGlobal::locale()->readNumber( input, &myok );
+ double ret = TDEGlobal::locale()->readNumber( input, &myok );
if ( ! myok )
ret = input.toDouble( & myok );
if ( ok ) *ok = myok;
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 36cfef0b..35269399 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -114,7 +114,7 @@ void CoordinateValidator::fixup( TQString & input ) const
if ( sc == -1 )
{
sc = input.length();
- KLocale* l = KGlobal::locale();
+ KLocale* l = TDEGlobal::locale();
if ( mpolar )
input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
TQString::fromLatin1( "0°" ) );
@@ -144,8 +144,8 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d
Rect sr = d.suggestedRect();
double m = kigMax( sr.width(), sr.height() );
int l = kigMax( 0, (int) ( 3 - log10( m ) ) );
- TQString xs = KGlobal::locale()->formatNumber( p.x, l );
- TQString ys = KGlobal::locale()->formatNumber( p.y, l );
+ TQString xs = TDEGlobal::locale()->formatNumber( p.x, l );
+ TQString ys = TDEGlobal::locale()->formatNumber( p.y, l );
return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys );
}
@@ -157,7 +157,7 @@ Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
{
TQString xs = r.cap(1);
TQString ys = r.cap(2);
- KLocale* l = KGlobal::locale();
+ KLocale* l = TDEGlobal::locale();
double x = l->readNumber( xs, &ok );
if ( ! ok ) x = xs.toDouble( &ok );
if ( ! ok ) return Coordinate();
@@ -272,7 +272,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co
p.drawText(
Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(),
- KGlobal::locale()->formatNumber( i, hnfrac ),
+ TDEGlobal::locale()->formatNumber( i, hnfrac ),
AlignLeft | AlignTop
);
};
@@ -281,7 +281,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co
{
if( fabs( i ) < 1e-8 ) continue;
p.drawText ( Rect( Coordinate( 0, i ), 2*hd, vd ).normalized(),
- KGlobal::locale()->formatNumber( i, vnfrac ),
+ TDEGlobal::locale()->formatNumber( i, vnfrac ),
AlignBottom | AlignLeft
);
};
@@ -351,8 +351,8 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c
double r = pt.length();
double theta = Goniometry::convert( atan2( pt.y, pt.x ), Goniometry::Rad, Goniometry::Deg );
- TQString rs = KGlobal::locale()->formatNumber( r, l );
- TQString ts = KGlobal::locale()->formatNumber( theta, 0 );
+ TQString rs = TDEGlobal::locale()->formatNumber( r, l );
+ TQString ts = TDEGlobal::locale()->formatNumber( theta, 0 );
return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts );
}
@@ -378,11 +378,11 @@ Coordinate PolarCoords::toScreen(const TQString& s, bool& ok) const
if (ok)
{
TQString rs = regexp.cap( 1 );
- double r = KGlobal::locale()->readNumber( rs, &ok );
+ double r = TDEGlobal::locale()->readNumber( rs, &ok );
if ( ! ok ) r = rs.toDouble( &ok );
if ( ! ok ) return Coordinate();
TQString ts = regexp.cap( 2 );
- double theta = KGlobal::locale()->readNumber( ts, &ok );
+ double theta = TDEGlobal::locale()->readNumber( ts, &ok );
if ( ! ok ) theta = ts.toDouble( &ok );
if ( ! ok ) return Coordinate();
theta *= M_PI;
@@ -465,7 +465,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const
// through the 0 etc. )
if( fabs( i ) < 1e-8 ) continue;
- TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac );
+ TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac );
p.drawText(
Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(),
is, AlignLeft | AlignTop );
@@ -475,7 +475,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const
{
if( fabs( i ) < 1e-8 ) continue;
- TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac );
+ TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac );
p.drawText ( Rect( Coordinate( 0, i ), hd, vd ).normalized(),
is, AlignBottom | AlignLeft
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index e2a8fe25..c02226e8 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -70,7 +70,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
// there is no KDE textditor component installed, so we'll use a
// simplier KTextEdit
textedit = new KTextEdit( mpcode, "textedit" );
- textedit->setFont( KGlobalSettings::fixedFont() );
+ textedit->setFont( TDEGlobalSettings::fixedFont() );
gridLayout->addWidget( textedit, 1, 0 );
}
else
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 00:47:20 +0000