diff options
Diffstat (limited to 'konqueror')
37 files changed, 131 insertions, 131 deletions
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog index e3af81e5e..cc734cffe 100644 --- a/konqueror/ChangeLog +++ b/konqueror/ChangeLog @@ -55,7 +55,7 @@ setHighlightingEnabled in the KonqDirPart constructor * konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and - KGlobal::config()->sync() after toggling the visiblity of the menubar, + TDEGlobal::config()->sync() after toggling the visiblity of the menubar, just like it is done for toolbars. (slotPartActivated): connect and disconnect to/from the actionStatusText and clearStatusText signals of the part's actioncollection diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index b726f759b..9d62fb1ce 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -182,7 +182,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString void KonquerorIface::reparseConfiguration() { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); KonqFMSettings::reparseConfiguration(); TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList(); diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 6b573d438..0f026a1ed 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -98,7 +98,7 @@ TQString KonqAboutPageFactory::launch() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); int iconSize = iconloader->currentSize(KIcon::Desktop); TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop ); TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop ); @@ -190,7 +190,7 @@ TQString KonqAboutPageFactory::intro() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small ); TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); @@ -244,7 +244,7 @@ TQString KonqAboutPageFactory::specs() if ( s_specs_html ) return *s_specs_html; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString res = loadFile( locate( "data", "konqueror/about/specs.html" )); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); if ( res.isEmpty() ) @@ -330,7 +330,7 @@ TQString KonqAboutPageFactory::tips() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString viewmag_icon_path = iconloader->iconPath("viewmag", KIcon::Small ); TQString history_icon_path = @@ -432,7 +432,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow * : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI ) { //m_mainWindow = mainWindow; - TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); + TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding(); if (codec) setCharset(codec->name(), true); else diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 566bb543d..2fc8b336a 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -308,9 +308,9 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co { if ( tempFile ) kdWarning() << "kfmclient used with --tempfile but is passing to an external browser! Tempfile will never be deleted" << endl; - KProcess proc; + TDEProcess proc; proc << strBrowser << url.url(); - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); return true; } @@ -370,16 +370,16 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co KStartupInfoId id; id.initId( startup_id_str ); id.setupStartupEnv(); - KProcess proc; + TDEProcess proc; proc << "kshell" << "konqueror"; if ( !mimetype.isEmpty() ) proc << "-mimetype" << mimetype; if ( tempFile ) proc << "-tempfile"; proc << url.url(); - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); KStartupInfo::resetStartupEnv(); - kdDebug( 1202 ) << "clientApp::createNewWindow KProcess started" << endl; + kdDebug( 1202 ) << "clientApp::createNewWindow TDEProcess started" << endl; //} } return true; @@ -422,7 +422,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up - // "app not found" in KProcessRunner, if that was the case. + // "app not found" in TDEProcessRunner, if that was the case. TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index b3cc59d85..5157ed360 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -1059,7 +1059,7 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item) { KFileItem* fileItem = item->item(); - if ( KGlobalSettings::showFilePreview( fileItem->url() ) ) { + if ( TDEGlobalSettings::showFilePreview( fileItem->url() ) ) { m_paOutstandingOverlays.append(item); if (m_paOutstandingOverlays.count() == 1) { diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index f96ab6cd6..8ae218611 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -185,8 +185,8 @@ TQString CurrentMgr::makeTimeStr(int b) TQDateTime dt; dt.setTime_t(b); return (dt.daysTo(TQDateTime::currentDateTime()) > 31) - ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) - : KGlobal::locale()->formatDateTime(dt, false); + ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) + : TDEGlobal::locale()->formatDateTime(dt, false); } /* -------------------------- */ @@ -252,7 +252,7 @@ KEBApp::KEBApp( ListView::self()->connectSignals(); - KGlobal::locale()->insertCatalogue("libkonq"); + TDEGlobal::locale()->insertCatalogue("libkonq"); m_canPaste = false; @@ -337,7 +337,7 @@ void KEBApp::notifyCommandExecuted() { /* -------------------------- */ void KEBApp::slotConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), "MainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() )); @@ -347,7 +347,7 @@ void KEBApp::slotConfigureToolbars() { void KEBApp::slotNewToolbarConfig() { // called when OK or Apply is clicked createGUI(); - applyMainWindowSettings(KGlobal::config(), "MainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } /* -------------------------- */ diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index dd1e7fe40..4edce07ad 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -568,7 +568,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) if ( e->state() & Qt::LeftButton && (e->pos() - m_dragStart).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { KURL url = KURL::fromPathOrURL( currentText() ); if ( url.isValid() ) @@ -733,7 +733,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText ); - //painter->setPen( KGlobalSettings::inactiveTextColor() ); + //painter->setPen( TDEGlobalSettings::inactiveTextColor() ); squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth ); TQFont font = painter->font(); font.setItalic( true ); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index be14f7e63..34efa99e5 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -61,7 +61,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai // There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins) // have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. - d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config()); + d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config()); if ( activePart ) { TDEInstance* instance = activePart->instance(); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config()); @@ -100,7 +100,7 @@ void KonqExtensionManager::apply() setChanged(false); if( d->mainWindow ) { - KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, KGlobal::instance()); + KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance()); TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow)); TQPtrListIterator<KParts::Plugin> it(plugins); KParts::Plugin *plugin; diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 7967384cb..d53c9154c 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -497,7 +497,7 @@ KonqFrameContainer::KonqFrameContainer( Orientation o, m_pFirstChild = 0L; m_pSecondChild = 0L; m_pActiveChild = 0L; - setOpaqueResize( KGlobalSettings::opaqueResize() ); + setOpaqueResize( TDEGlobalSettings::opaqueResize() ); } KonqFrameContainer::~KonqFrameContainer() diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 7e7a11ae4..9be0b538d 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -62,7 +62,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) KonquerorIface *kiface = new KonquerorIface; app.dcopClient()->setDefaultObject( kiface->objId() ); - KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq + TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq KImageIO::registerFormats(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -87,7 +87,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (args->isSet("profiles")) { - TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); + TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); profiles.sort(); for(TQStringList::ConstIterator it = profiles.begin(); it != profiles.end(); ++it) diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index b1597eccd..30a6b7bec 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -202,7 +202,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con // setup the completion object before createGUI(), so that the combo // picks up the correct mode from the HistoryManager (in slotComboPlugged) int mode = KonqSettings::settingsCompletionMode(); - s_pCompletion->setCompletionMode( (KGlobalSettings::Completion) mode ); + s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode ); } connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory())); @@ -218,7 +218,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con initCombo(); initActions(); - setInstance( KGlobal::instance() ); + setInstance( TDEGlobal::instance() ); connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), this, TQT_SLOT( slotDatabaseChanged() ) ); @@ -1455,7 +1455,7 @@ void KonqMainWindow::slotOpenTerminal() } } - KProcess cmd; + TDEProcess cmd; cmd.setWorkingDirectory(dir); // Compensate for terminal having arguments. @@ -1465,7 +1465,7 @@ void KonqMainWindow::slotOpenTerminal() kdDebug(1202) << "slotOpenTerminal: directory " << dir << ", terminal:" << term << endl; - cmd.start(KProcess::DontCare); + cmd.start(TDEProcess::DontCare); } void KonqMainWindow::slotOpenLocation() @@ -1945,7 +1945,7 @@ void KonqMainWindow::slotGoTrash() void KonqMainWindow::slotGoAutostart() { KURL u; - u.setPath( KGlobalSettings::autostartPath() ); + u.setPath( TDEGlobalSettings::autostartPath() ); openURL( 0L, u ); } @@ -2022,7 +2022,7 @@ void KonqMainWindow::slotConfigureSpellChecking() void KonqMainWindow::slotConfigureToolbars() { if ( autoSaveSettings() ) - saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); KEditToolbar dlg(factory()); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar())); @@ -2038,7 +2038,7 @@ void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply i plugViewModeActions(); - applyMainWindowSettings( KGlobal::config(), "KonqMainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); } void KonqMainWindow::slotUndoAvailable( bool avail ) @@ -2728,7 +2728,7 @@ void KonqMainWindow::slotPopupThisWindow() void KonqMainWindow::slotPopupNewTabAtFront() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") ); bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false ); popupNewTab(true, openAfterCurrentPage); @@ -3281,8 +3281,8 @@ void KonqMainWindow::initCombo() // We do want completion of user names, right? //m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!! - connect( m_combo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ))); + connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); connect( m_combo, TQT_SIGNAL( completion( const TQString& )), TQT_SLOT( slotMakeCompletion( const TQString& ))); connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )), @@ -3312,7 +3312,7 @@ void KonqMainWindow::bookmarksIntoCompletion() } // the user changed the completion mode in the combo -void KonqMainWindow::slotCompletionModeChanged( KGlobalSettings::Completion m ) +void KonqMainWindow::slotCompletionModeChanged( TDEGlobalSettings::Completion m ) { s_pCompletion->setCompletionMode( m ); @@ -3350,8 +3350,8 @@ void KonqMainWindow::slotMakeCompletion( const TQString& text ) completion = s_pCompletion->makeCompletion( text ); // some special handling necessary for CompletionPopup - if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup || - m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) + if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup || + m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto ) m_combo->setCompletedItems( historyPopupCompletionItems( text ) ); else if ( !completion.isNull() ) @@ -3414,8 +3414,8 @@ void KonqMainWindow::slotMatch( const TQString &match ) m_urlCompletionStarted = false; // some special handling necessary for CompletionPopup - if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup || - m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) { + if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup || + m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto ) { TQStringList items = m_pURLCompletion->allMatches(); items += historyPopupCompletionItems( m_combo->currentText() ); // items.sort(); // should we? @@ -3599,8 +3599,8 @@ void KonqMainWindow::slotForceSaveMainWindowSettings() // kdDebug(1202)<<"slotForceSaveMainWindowSettings()"<<endl; if ( autoSaveSettings() ) // don't do it on e.g. JS window.open windows with no toolbars! { - saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" ); - KGlobal::config()->sync(); + saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); + TDEGlobal::config()->sync(); } } @@ -5107,7 +5107,7 @@ void KonqMainWindow::updateViewModeActions() // Another temporary map, the preferred service for each library (2 entries in our example) TQMap<TQString,TQString> preferredServiceMap; - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); config->setGroup( "ModeToolBarServices" ); KTrader::OfferList::ConstIterator it = services.begin(); @@ -5243,7 +5243,7 @@ void KonqMainWindow::saveToolBarServicesMap() { TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin(); TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end(); - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); config->setGroup( "ModeToolBarServices" ); for ( ; serviceIt != serviceEnd ; ++serviceIt ) config->writeEntry( serviceIt.key(), serviceIt.data()->desktopEntryName() ); @@ -5295,7 +5295,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(viewManager()->docContainer()); if ( tabContainer->count() > 1 ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) @@ -5481,8 +5481,8 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) { - static const TQString& http = KGlobal::staticQString( "http" ); - static const TQString& ftp = KGlobal::staticQString( "ftp" ); + static const TQString& http = TDEGlobal::staticQString( "http" ); + static const TQString& ftp = TDEGlobal::staticQString( "ftp" ); if ( group.isNull() ) return; @@ -5990,23 +5990,23 @@ static int current_memory_usage( int* limit ) void KonqMainWindow::saveWindowSize() const { - TQString savedGroup = KGlobal::config()->group(); - KGlobal::config()->setGroup( "KonqMainWindow_Size" ); + TQString savedGroup = TDEGlobal::config()->group(); + TDEGlobal::config()->setGroup( "KonqMainWindow_Size" ); - KParts::MainWindow::saveWindowSize( KGlobal::config() ); + KParts::MainWindow::saveWindowSize( TDEGlobal::config() ); - KGlobal::config()->setGroup( savedGroup ); - KGlobal::config()->sync(); + TDEGlobal::config()->setGroup( savedGroup ); + TDEGlobal::config()->sync(); } void KonqMainWindow::restoreWindowSize() { - TQString savedGroup = KGlobal::config()->group(); - KGlobal::config()->setGroup( "KonqMainWindow_Size" ); + TQString savedGroup = TDEGlobal::config()->group(); + TDEGlobal::config()->setGroup( "KonqMainWindow_Size" ); - KParts::MainWindow::restoreWindowSize( KGlobal::config() ); + KParts::MainWindow::restoreWindowSize( TDEGlobal::config() ); - KGlobal::config()->setGroup( savedGroup ); + TDEGlobal::config()->setGroup( savedGroup ); } diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index ac73c3670..c0dd75692 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -491,7 +491,7 @@ protected slots: void slotForwardActivated( int id ); void slotGoHistoryDelayed(); - void slotCompletionModeChanged( KGlobalSettings::Completion ); + void slotCompletionModeChanged( TDEGlobalSettings::Completion ); void slotMakeCompletion( const TQString& ); void slotSubstringcompletion( const TQString& ); void slotRotation( KCompletionBase::KeyBindingType ); diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 2a3547068..4c5fa868b 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -42,7 +42,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() { KonqProfileMap mapProfiles; - TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); + TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); TQStringList::ConstIterator pIt = profiles.begin(); TQStringList::ConstIterator pEnd = profiles.end(); for (; pIt != pEnd; ++pIt ) diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 466504b47..8a5ff3e87 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -321,7 +321,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame ) void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage ) { - setTabColor( newPage, KGlobalSettings::textColor() ); + setTabColor( newPage, TDEGlobalSettings::textColor() ); KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage); if (currentFrame && !m_pViewManager->isLoadingProfile()) { diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 58ed78b38..6a7234c60 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -1342,9 +1342,9 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) void KonqView::setActiveInstance() { if ( m_bBuiltinView || !m_pPart->instance() /*never!*/) - KGlobal::_activeInstance = KGlobal::instance(); + TDEGlobal::_activeInstance = TDEGlobal::instance(); else - KGlobal::_activeInstance = m_pPart->instance(); + TDEGlobal::_activeInstance = m_pPart->instance(); } bool KonqView::prepareReload( KParts::URLArgs& args ) diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 5d0c0af57..2af897dd3 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -309,7 +309,7 @@ public: void goHistory( int steps ); - // Set the KGlobal active instance (the one used by KBugReport) + // Set the TDEGlobal active instance (the one used by KBugReport) void setActiveInstance(); // Called before reloading this view. Sets args.reload to true, and offers to repost form data. diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 8fce3f146..4413416fb 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1078,7 +1078,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString { TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + - fileName, KGlobal::instance() ); + fileName, TDEGlobal::instance() ); if ( TQFile::exists( path ) ) TQFile::remove( path ); @@ -1299,7 +1299,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, if( resetWindow ) { // force default settings for the GUI - m_pMainWindow->applyMainWindowSettings( KGlobal::config(), "KonqMainWindow", true ); + m_pMainWindow->applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow", true ); } // Apply menu/toolbar settings saved in profile. Read from a separate group @@ -1411,7 +1411,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) int width = -1; int height = -1; - TQRect geom = KGlobalSettings::desktopGeometry(widget); + TQRect geom = TDEGlobalSettings::desktopGeometry(widget); if ( widthStr.contains( '%' ) == 1 ) { @@ -1755,15 +1755,15 @@ void KonqViewManager::setLoading( KonqView *view, bool loading ) TQColor color; KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer ); if ( loading ) - color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2, - (KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2, - (KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 ); + color = TQColor( (TDEGlobalSettings::linkColor().red() + TDEGlobalSettings::inactiveTextColor().red())/2, + (TDEGlobalSettings::linkColor().green()+ TDEGlobalSettings::inactiveTextColor().green())/2, + (TDEGlobalSettings::linkColor().blue() + TDEGlobalSettings::inactiveTextColor().blue())/2 ); else { if ( konqframetabs->currentPage() != view->frame() ) - color = KGlobalSettings::linkColor(); + color = TDEGlobalSettings::linkColor(); else - color = KGlobalSettings::textColor(); + color = TDEGlobalSettings::textColor(); } konqframetabs->setTabColor( view->frame(), color ); } diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index 756b80e2d..c4a82225f 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -53,7 +53,7 @@ </entry> <!-- fontopts.cpp --> <entry key="StandardFont" type="Font"> <!--LIBKONQ--> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> <label>Standard font</label> <whatsthis>This is the font used to display text in Konqueror windows.</whatsthis> <!-- checked --> @@ -580,7 +580,7 @@ PATH_JAVA <!-- checked --> </entry> <entry name="SettingsCompletionMode" key="CompletionMode" type="Enum"> - <default code="true">KGlobalSettings::completionMode()</default> + <default code="true">TDEGlobalSettings::completionMode()</default> <label></label> <whatsthis></whatsthis> </entry> diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index b06baaf7d..188c3c394 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -87,7 +87,7 @@ void KonqInfoListViewItem::updateContents() break; case KIO::UDS_SIZE: if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() ) - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); else setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" "); break; @@ -103,7 +103,7 @@ void KonqInfoListViewItem::updateContents() if ( _time != 0 ) { dt.setTime_t( _time ); - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt)); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt)); } } break; @@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) { KonqBaseListViewItem::setDisabled( disabled ); int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize(); - iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small + iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index b3b886d8d..94f9211ac 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -124,7 +124,7 @@ void ListViewBrowserExtension::updateActions() { canCopy++; KURL url = item->url(); - if ( url.directory(false) == KGlobalSettings::trashPath() ) + if ( url.directory(false) == TDEGlobalSettings::trashPath() ) bInTrash = true; if ( KProtocolInfo::supportsDeleting( url ) ) canDel++; diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 016f3d77a..616559bad 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -119,7 +119,7 @@ void KonqListViewItem::updateContents() break; case KIO::UDS_SIZE: if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() ) - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); else setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" "); break; @@ -135,7 +135,7 @@ void KonqListViewItem::updateContents() if ( _time != 0 ) { dt.setTime_t( _time ); - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt)); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt)); } } break; @@ -146,7 +146,7 @@ void KonqListViewItem::updateContents() { TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate )); setText(tmpColumn->displayInColumn, - KGlobal::locale()->formatDateTime(dt)); + TDEGlobal::locale()->formatDateTime(dt)); } else // if ( tmpColumn->type == TQVariant::String ) setText(tmpColumn->displayInColumn, entryStr); @@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled ) { KonqBaseListViewItem::setDisabled( disabled ); int iconSize = m_pListViewWidget->iconSize(); - iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small + iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } @@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active ) //#### Optimize away repaint if possible, like the iconview does? KonqBaseListViewItem::setActive( active ); int iconSize = m_pListViewWidget->iconSize(); - iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small + iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 7156d10b3..8c4b17319 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -276,7 +276,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) TQString str; if ( tmpColumn->udsId == KIO::UDS_SIZE ) - str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " "; + str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + " "; else if ( tmpColumn->udsId == KIO::UDS_ACCESS ) str = "--Permissions--"; else if ( tmpColumn->udsId == KIO::UDS_USER ) @@ -296,7 +296,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) (tmpColumn->type & TQVariant::DateTime)) ) { TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) ); - str = KGlobal::locale()->formatDateTime( dt ) + "--"; + str = TDEGlobal::locale()->formatDateTime( dt ) + "--"; } else str = "it_is_the_default_width"; @@ -492,7 +492,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) vp.setY( itemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); - m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); + m_fileTip->setPreview( TDEGlobalSettings::showFilePreview( item->item()->url() ) ); setShowToolTips( !m_pSettings->showFileTips() ); } else @@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag() if (( urls.count() > 1 ) || (pixmap0Invalid)) { int iconSize = m_pBrowserView->m_pProps->iconSize(); - iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small + iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small pixmap2 = DesktopIcon( "kmultiple", iconSize ); if ( pixmap2.isNull() ) kdWarning(1202) << "Could not find multiple pixmap" << endl; @@ -977,7 +977,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) KURL url = fileItem->url(); url.cleanPath(); - bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath()); + bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(TDEGlobalSettings::trashPath()); if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) ) { m_pBrowserView->lmbClicked( fileItem ); @@ -1010,7 +1010,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) TQPixmap *pix = new TQPixmap(*(_item->pixmap(0))); // call the icon effect if enabled - if (KGlobalSettings::showKonqIconActivationEffect() == true) { + if (TDEGlobalSettings::showKonqIconActivationEffect() == true) { KIconEffect::visualActivate(viewport(), rect, pix); } diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 8e03e171e..e594e8a9a 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -171,7 +171,7 @@ void KonqTextViewItem::updateContents() break; case KIO::UDS_SIZE: if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() ) - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+" "); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" "); else setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" "); break; @@ -187,7 +187,7 @@ void KonqTextViewItem::updateContents() { TQDateTime dt; dt.setTime_t((time_t) (*it).m_long); - setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt)); + setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt)); break; }; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index edaacf1dd..a927f37e0 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -77,7 +77,7 @@ KRemoteEncodingPlugin::loadSettings() { m_loaded = true; - m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames(); + m_encodingDescriptions = TDEGlobal::charsets()->descriptiveEncodingNames(); fillMenu(); } @@ -172,7 +172,7 @@ KRemoteEncodingPlugin::slotItemSelected(int id) if (!m_menu->popupMenu()->isItemChecked(id)) { - TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]); + TQString charset = TDEGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]); config.setGroup(host); config.writeEntry(DATA_KEY, charset); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 7af5ed2bf..3f93feade 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -39,7 +39,7 @@ KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* ,m_writeNotifier(0) { setTextFormat(PlainText); - setFont( KGlobalSettings::fixedFont() ); + setFont( TDEGlobalSettings::fixedFont() ); } KShellCommandExecutor::~KShellCommandExecutor() diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index 66dd0b7bb..fefc52de4 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -67,12 +67,12 @@ void KShellCmdPlugin::slotExecuteShellCommand() bool ok; TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"), i18n( "Execute shell command in current directory:" ), - KProcess::quote( path ), &ok, part->widget() ); + TDEProcess::quote( path ), &ok, part->widget() ); if ( ok ) { TQString chDir; chDir="cd "; - chDir+=KProcess::quote(part->url().path()); + chDir+=TDEProcess::quote(part->url().path()); chDir+="; "; chDir+=cmd; diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index aba5e3a26..f1dd6ad22 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu() { if (!menu) return; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true); libNames.setAutoDelete(true); libNames.resize(0); @@ -122,7 +122,7 @@ void addBackEnd::doRollBack() { if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue) { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true); TQDir dir(loc); TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks ); @@ -139,7 +139,7 @@ void addBackEnd::doRollBack() static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) { TQString myFile, filename; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString tmp = *tmpl; if (universal) { @@ -248,7 +248,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons { m_relPath = "konqsidebartng/" + currentProfile + "/entries/"; } - m_path = KGlobal::dirs()->saveLocation("data", m_relPath, true); + m_path = TDEGlobal::dirs()->saveLocation("data", m_relPath, true); m_buttons.setAutoDelete(true); m_hasStoredUrl = false; m_latestViewed = -1; @@ -331,7 +331,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { // << " [" << name << "]" << endl; // Look for existing ones with this URL - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString list; dirs->saveLocation("data", m_relPath, true); list = locateLocal("data", m_relPath); @@ -370,7 +370,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { void Sidebar_Widget::finishRollBack() { - m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true); + m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } @@ -421,9 +421,9 @@ void Sidebar_Widget::initialCopy() kdDebug()<<"Initial copy"<<endl; TQStringList dirtree_dirs; if (m_universalMode) - dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/"); + dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/"); else - dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/entries/"); + dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/entries/"); if (dirtree_dirs.last()==m_path) return; //oups; @@ -467,9 +467,9 @@ void Sidebar_Widget::initialCopy() !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); - cp += KProcess::quote(dirtree_dir + *eIt); + cp += TDEProcess::quote(dirtree_dir + *eIt); cp += " "; - cp += KProcess::quote(m_path); + cp += TDEProcess::quote(m_path); kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl; ::system( TQFile::encodeName(cp) ); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 811867b14..16520d0e0 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -92,7 +92,7 @@ void KonqSidebarDirTreeItem::setOpen( bool open ) MYMODULE->openSubFolder( this ); else if ( hasStandardIcon() ) { - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); if ( open ) setPixmap( 0, DesktopIcon( "folder_open", size ) ); else @@ -159,7 +159,7 @@ void KonqSidebarDirTreeItem::itemSelected() { bool bInTrash = false; - if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() ) + if ( m_fileItem->url().directory(false) == TDEGlobalSettings::trashPath() ) bInTrash = true; TQMimeSource *data = TQApplication::clipboard()->data(); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index c8707970c..7d8f7b1fd 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) if ( !item->isTopLevelItem() && static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() ) { - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); TQPixmap pix = DesktopIcon( "folder_open", size ); m_pTree->startAnimation( item, "kde", 6, &pix ); } @@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) { // We have this directory listed already, just copy the entries as we // can't use the dirlister, it would invalidate the old entries - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild()); while(oldItem) @@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) } kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl; - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); do { kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl; @@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries ) { - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); TQPtrListIterator<KFileItem> kit ( entries ); kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl; diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 0d31551f9..44389702e 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -119,7 +119,7 @@ TQString KonqSidebarHistoryItem::toolTipText() const // .arg() calls. So to fix this, we first substitute the last items // and then put in the url. TQString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>"); - return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() ); + return tip.arg( TDEGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( TDEGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() ); } return m_entry->url.url(); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index a7fd943ca..71c1b5a44 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -56,7 +56,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName"; @@ -111,7 +111,7 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule() ++it; } - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); kc->writeEntry("OpenGroups", openGroups); kc->sync(); @@ -143,7 +143,7 @@ void KonqSidebarHistoryModule::slotCreateItems() ++it; } - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); TQStringList openGroups = kc->readListEntry("OpenGroups"); TQStringList::Iterator it2 = openGroups.begin(); @@ -297,7 +297,7 @@ void KonqSidebarHistoryModule::sortingChanged() { m_topLevelItem->sort(); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" ); kc->sync(); diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 752ff57fd..cbba40262 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -61,7 +61,7 @@ public: bool sortsByName() const { return m_sortsByName; } static TQString groupForURL( const KURL& url ) { - static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous")); + static const TQString& misc = TDEGlobal::staticQString(i18n("Miscellaneous")); return url.host().isEmpty() ? misc : url.host(); } diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 6871415a0..3e8c8a5de 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -46,7 +46,7 @@ void KonqSidebarHistorySettings::readSettings(bool global) TQString oldgroup; if (global) { - config = KGlobal::config(); + config = TDEGlobal::config(); oldgroup= config->group(); } else diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 532e3a164..a1ef792d6 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") ) HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & ) : KCModule (KCMHistoryFactory::instance(), parent, name) { - KGlobal::locale()->insertCatalogue("konqueror"); + TDEGlobal::locale()->insertCatalogue("konqueror"); m_settings = new KonqSidebarHistorySettings( 0, "history settings" ); m_settings->readSettings( false ); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 2ed02b6cf..7ba7c3014 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -87,7 +87,7 @@ void KonqSidebarTree::loadModuleFactories() { pluginFactories.clear(); pluginInfo.clear(); - KStandardDirs *dirs=KGlobal::dirs(); + KStandardDirs *dirs=TDEGlobal::dirs(); TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); @@ -168,12 +168,12 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ -// assert( KGlobal::dirs() ); +// assert( TDEGlobal::dirs() ); // TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); if (virt==VIRT_Folder) { - m_dirtreeDir.dir.setPath(KGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/")); + m_dirtreeDir.dir.setPath(TDEGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/")); m_dirtreeDir.relDir=path; } else @@ -620,10 +620,10 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path if (copyConfig) { // We will copy over the configuration for the dirtree, from the global directory - TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/"); + TQStringList dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/"); -// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global +// TQString dirtree_dir = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global // kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl; /* @@ -655,9 +655,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); - cp += KProcess::quote(dirtree_dir + *eIt); + cp += TDEProcess::quote(dirtree_dir + *eIt); cp += " "; - cp += KProcess::quote(path); + cp += TDEProcess::quote(path); kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl; ::system( TQFile::encodeName(cp) ); } @@ -698,7 +698,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path { TQString newPath = TQString( path ).append( *eIt ).append( '/' ); - if ( newPath == KGlobalSettings::autostartPath() ) + if ( newPath == TDEGlobalSettings::autostartPath() ) continue; loadTopLevelGroup( parent, newPath ); @@ -984,7 +984,7 @@ void KonqSidebarTree::slotCreateFolder() name = name + "-2"; } - KGlobal::dirs()->makeDir(path); + TDEGlobal::dirs()->makeDir(path); loadTopLevelGroup(m_currentTopLevelItem, path); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 0dc9303b4..1cdf54da0 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -134,7 +134,7 @@ extern "C" { KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) { - KStandardDirs *dirs=KGlobal::dirs(); + KStandardDirs *dirs=TDEGlobal::dirs(); TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); TQStringList names; for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 3697c443f..a337c65c6 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -191,10 +191,10 @@ extern "C" { extern "C" { KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); - KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); + TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); KURL url; url.setProtocol("file"); - TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata"); + TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata"); for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) { if (TQFileInfo(*i + "websidebar.html").exists()) { url.setPath(*i + "websidebar.html"); |