diff options
| -rw-r--r-- | src/app/mainWindow.cpp | 6 | ||||
| -rw-r--r-- | src/part/Config.cpp | 2 | ||||
| -rw-r--r-- | src/part/fileTree.cpp | 2 | ||||
| -rw-r--r-- | src/part/progressBox.cpp | 2 | ||||
| -rw-r--r-- | src/part/radialMap/map.cpp | 2 | ||||
| -rw-r--r-- | src/part/radialMap/segmentTip.cpp | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index 4302891..fa5d365 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -65,7 +65,7 @@ MainWindow::MainWindow() connect( m_part, TQT_SIGNAL(canceled( const TQString& )), m_histories, TQT_SLOT(stop()) ); connect( BrowserExtension::childObject( m_part ), TQT_SIGNAL(openURLNotify()), TQT_SLOT(urlAboutToChange()) ); - KConfig* const config = KGlobal::config(); + KConfig* const config = TDEGlobal::config(); config->setGroup( "general" ); m_combo->setHistoryItems( config->readPathListEntry( "comboHistory" ) ); applyMainWindowSettings( config, "window" ); @@ -100,7 +100,7 @@ MainWindow::setupActions() //singleton function m_histories = new HistoryCollection( ac, TQT_TQOBJECT(this), "history_collection" ); ac->action( "scan_directory" )->setText( i18n( "&Scan Directory..." ) ); - m_recentScans->loadEntries( KGlobal::config() ); + m_recentScans->loadEntries( TDEGlobal::config() ); combo->setAutoSized( true ); //FIXME what does this do? connect( m_recentScans, TQT_SIGNAL(urlSelected( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) ); @@ -114,7 +114,7 @@ MainWindow::queryExit() if( !m_part ) //apparently std::exit() still calls this function, and abort() causes a crash.. return true; - KConfig* const config = KGlobal::config(); + KConfig* const config = TDEGlobal::config(); saveMainWindowSettings( config, "window" ); m_recentScans->saveEntries( config ); diff --git a/src/part/Config.cpp b/src/part/Config.cpp index f940480..2da592d 100644 --- a/src/part/Config.cpp +++ b/src/part/Config.cpp @@ -20,7 +20,7 @@ TQStringList Config::skipList; inline KConfig& Filelight::Config::kconfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "filelight_part" ); return *config; } diff --git a/src/part/fileTree.cpp b/src/part/fileTree.cpp index cab0a04..95f3c68 100644 --- a/src/part/fileTree.cpp +++ b/src/part/fileTree.cpp @@ -40,7 +40,7 @@ File::humanReadableSize( uint size, UnitPrefix key /*= mega*/ ) //static TQString s; double prettySize = (double)size / (double)DENOMINATOR[key]; - const KLocale &locale = *KGlobal::locale(); + const KLocale &locale = *TDEGlobal::locale(); if( prettySize >= 0.01 ) { diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp index 6f1d5b1..0cc99f3 100644 --- a/src/part/progressBox.cpp +++ b/src/part/progressBox.cpp @@ -16,7 +16,7 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part ) hide(); setAlignment( TQt::AlignCenter ); - setFont( KGlobalSettings::fixedFont() ); + setFont( TDEGlobalSettings::fixedFont() ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); setText( 999999 ); diff --git a/src/part/radialMap/map.cpp b/src/part/radialMap/map.cpp index 725b3f8..34a1c6c 100644 --- a/src/part/radialMap/map.cpp +++ b/src/part/radialMap/map.cpp @@ -178,7 +178,7 @@ RadialMap::Map::colorise() double contrast = (double)Config::contrast / (double)100; int h, s1, s2, v1, v2; - TQColor kdeColour[2] = { KGlobalSettings::inactiveTitleColor(), KGlobalSettings::activeTitleColor() }; + TQColor kdeColour[2] = { TDEGlobalSettings::inactiveTitleColor(), TDEGlobalSettings::activeTitleColor() }; double deltaRed = (double)(kdeColour[0].red() - kdeColour[1].red()) / 2880; //2880 for semicircle double deltaGreen = (double)(kdeColour[0].green() - kdeColour[1].green()) / 2880; diff --git a/src/part/radialMap/segmentTip.cpp b/src/part/radialMap/segmentTip.cpp index 3fb5d34..4f3d042 100644 --- a/src/part/radialMap/segmentTip.cpp +++ b/src/part/radialMap/segmentTip.cpp @@ -51,7 +51,7 @@ SegmentTip::moveTo( TQPoint p, const TQWidget &canvas, bool placeAbove ) p.rx() -= rect().center().x(); p.ry() -= (placeAbove ? 8 + height() : m_cursorHeight - 8); - const TQRect screen = KGlobalSettings::desktopGeometry( parentWidget() ); + const TQRect screen = TDEGlobalSettings::desktopGeometry( parentWidget() ); const int x = p.x(); const int y = p.y(); @@ -107,7 +107,7 @@ SegmentTip::updateTip( const File* const file, const Directory* const root ) { const TQString s1 = file->fullPath( root ); TQString s2 = file->humanReadableSize(); - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); const uint MARGIN = 3; const uint pc = 100 * file->size() / root->size(); uint maxw = 0; |