diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:50:05 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:50:05 -0600 |
commit | 2178da111f72dc574457d5242d120b4d10ea5edd (patch) | |
tree | 3f1a143f751c624ab24c35d67229121c98c7cefa /kweather/dockwidget.cpp | |
parent | f39ce360454f118af0d94b215b83dbd950276ff7 (diff) | |
download | tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.tar.gz tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kweather/dockwidget.cpp')
-rw-r--r-- | kweather/dockwidget.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index b8c5024..1e223bd 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -33,7 +33,7 @@ dockwidget::dockwidget(const TQString &location, TQWidget *parent, const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal ) { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); setBackgroundOrigin( AncestorOrigin ); initDock(); connect(m_button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( buttonClicked() )); @@ -306,7 +306,7 @@ void dockwidget::resizeView( const TQSize &size ) int dockwidget::widthForHeight(int h) { int w; - TQFontInfo fi(KGlobalSettings::generalFont()); + TQFontInfo fi(TDEGlobalSettings::generalFont()); if ( m_mode == ShowAll ) { @@ -322,7 +322,7 @@ int dockwidget::widthForHeight(int h) { if ( fi.pixelSize() * 3 <= (h/2) ) // half icon, half text { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else { @@ -349,7 +349,7 @@ int dockwidget::widthForHeight(int h) { if ( fi.pixelSize() <= (h/2) ) // half icon, half text { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else { @@ -377,14 +377,14 @@ int dockwidget::heightForWidth( int w ) if ( m_mode == ShowAll ) { - TQFontMetrics fmg(KGlobalSettings::generalFont()); + TQFontMetrics fmg(TDEGlobalSettings::generalFont()); int maxWidth = fmg.width("888 km/h NNWW"); // a good approximation if ( w <= 128 ) // top to bottom { if ( maxWidth <= w ) // enough space to use global font { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else // we have to reduce the fontsize { @@ -398,7 +398,7 @@ int dockwidget::heightForWidth( int w ) { if ( w >= (maxWidth * 1.5) ) // half of text width shall be icon { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else { @@ -412,14 +412,14 @@ int dockwidget::heightForWidth( int w ) } else if ( m_mode == ShowTempOnly ) { - TQFontMetrics fmg(KGlobalSettings::generalFont()); + TQFontMetrics fmg(TDEGlobalSettings::generalFont()); int maxWidth = fmg.width("888.88 CC"); // a good approximation if ( w <= 128 ) // top to bottom { if ( maxWidth <= w ) // enough space to use global font { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else // we have to reduce the fontsize { @@ -433,7 +433,7 @@ int dockwidget::heightForWidth( int w ) { if ( w >= (maxWidth * 1.5) ) // half of text width shall be icon { - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); } else { |