From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:51 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- konq-plugins/akregator/akregatorplugin.cpp | 4 ++-- konq-plugins/akregator/konqfeedicon.cpp | 8 ++++---- konq-plugins/akregator/pluginbase.cpp | 4 ++-- konq-plugins/arkplugin/arkplugin.cpp | 2 +- konq-plugins/domtreeviewer/domlistviewitem.cpp | 2 +- konq-plugins/domtreeviewer/domtreeview.cpp | 4 ++-- konq-plugins/fsview/fsview_part.cpp | 2 +- konq-plugins/fsview/inode.cpp | 10 +++++----- konq-plugins/fsview/main.cpp | 2 +- konq-plugins/kimgalleryplugin/imgallerydialog.cpp | 4 ++-- konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 2 +- konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 2 +- konq-plugins/kuick/kdirmenu.cpp | 6 +++--- konq-plugins/kuick/kuick_plugin.cpp | 2 +- konq-plugins/microformat/konqmficon.cpp | 4 ++-- konq-plugins/searchbar/searchbar.cpp | 6 +++--- konq-plugins/searchbar/searchbar.h | 4 ++-- konq-plugins/sidebar/delicious/bookmarkListItem.cpp | 2 +- konq-plugins/sidebar/delicious/mainWidget.cpp | 6 +++--- konq-plugins/sidebar/delicious/plugin.cpp | 2 +- konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 2 +- konq-plugins/sidebar/metabar/src/metabar.cpp | 2 +- konq-plugins/sidebar/metabar/src/serviceloader.cpp | 2 +- konq-plugins/sidebar/newsticker/sidebar_news.cpp | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 2 +- konq-plugins/webarchiver/plugin_webarchiver.cpp | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) (limited to 'konq-plugins') diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index ec7af3e..d5b3e6a 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -71,7 +71,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (view) m_part = view->part(); - KGlobal::locale()->insertCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); m_feedMimeTypes << "text/rss" << "text/rdf" << "text/xml"; // Get the list of URLs clicked on from Konqi. //KFileItemList m_list = popupmenu->fileItemList(); @@ -97,7 +97,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const AkregatorMenu::~AkregatorMenu() { - KGlobal::locale()->removeCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->removeCatalogue("akregator_konqplugin"); delete m_conf; } diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 9350bb4..a81d1a1 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -58,7 +58,7 @@ K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { - KGlobal::locale()->insertCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); m_part = dynamic_cast(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } @@ -77,7 +77,7 @@ void KonqFeedIcon::waitPartToLoad() KonqFeedIcon::~KonqFeedIcon() { - KGlobal::locale()->removeCatalogue("akregator_konqplugin"); + TDEGlobal::locale()->removeCatalogue("akregator_konqplugin"); m_statusBarEx = KParts::StatusBarExtension::childObject(m_part); if (m_statusBarEx) { @@ -205,14 +205,14 @@ void KonqFeedIcon::addFeeds() } else { kdDebug() << "KonqFeedIcon::addFeeds(): use command line" << endl; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it ) { *proc << "-a" << fixRelativeURL((*it).url(), m_part->baseURL()); } - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; } diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index c0ade83..eb590eb 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -62,10 +62,10 @@ void PluginBase::addFeedsViaDCOP(const TQStringList& urls) void PluginBase::addFeedViaCmdLine(TQString url) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); *proc << "-a" << url; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; } diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 4f712df..fef5779 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -55,7 +55,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis if ( !m_conf->readBoolEntry( "KonquerorIntegration", true ) ) return; - KGlobal::locale()->insertCatalogue("ark_plugin"); + TDEGlobal::locale()->insertCatalogue("ark_plugin"); extMimeTypes(); KFileItemList itemList = popupmenu->fileItemList(); diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 7ab20b4..d956ceb 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -55,7 +55,7 @@ DOMListViewItem::~DOMListViewItem() void DOMListViewItem::init() { m_color = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Text ); - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); clos = false; } diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index d196f40..15c7d6a 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -71,7 +71,7 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* { part = 0; - const TQFont font(KGlobalSettings::generalFont()); + const TQFont font(TDEGlobalSettings::generalFont()); m_listView->setFont( font ); m_listView->setSorting(-1); m_rootListView = m_listView; @@ -310,7 +310,7 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item TQTextStream ts( text, IO_ReadOnly ); while (!ts.eof()) { const TQString txt(ts.readLine()); - const TQFont font(KGlobalSettings::fixedFont()); + const TQFont font(TDEGlobalSettings::fixedFont()); cur_item->setFont( font ); cur_item->setText(0, txt); diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 3a913ec..5bef896 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -185,7 +185,7 @@ void FSViewPart::slotSettingsChanged(int category) TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); else diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 6f5073c..d12f495 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -327,19 +327,19 @@ TQString Inode::text(int i) const if (s < 1000) text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index f2f2daf..ec24f6d 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::addCmdLineOptions(options); TDEApplication a; - KConfigGroup gconfig(KGlobal::config(), TQCString("General")); + KConfigGroup gconfig(TDEGlobal::config(), TQCString("General")); TQString path = gconfig.readPathEntry("Path", "."); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index d5fe29a..77758b1 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -65,7 +65,7 @@ void KIGPDialog::slotDefault() m_imageName->setChecked(true); m_imageSize->setChecked(false); m_imageProperty->setChecked(false); - m_fontName->setCurrentText( KGlobalSettings::generalFont().family() ); + m_fontName->setCurrentText( TDEGlobalSettings::generalFont().family() ); m_fontSize->setValue(14); m_foregroundColor->setColor( TQColor( "#d0ffd0") ); m_backgroundColor->setColor( TQColor("#333333") ); @@ -127,7 +127,7 @@ void KIGPDialog::setupLookPage(const TQString& path) { TQStringList standardFonts; KFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); - m_fontName->setCurrentText( m_config->readEntry("FontName", KGlobalSettings::generalFont().family() ) ); + m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) ); label = new TQLabel( i18n("Fon&t name:"), page ); label->setBuddy( m_fontName ); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 74d0150..68cccfe 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -163,7 +163,7 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi { int numOfImages = imageDir.count(); const TQString imgGalleryDir = url.directory(); - const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); + const TQString today(TDEGlobal::locale()->formatDate(TQDate::currentDate())); stream << "\n

" << TQStyleSheet::escape(m_configDlg->getTitle()) << "

" << endl; stream << i18n("Number of images: %1").arg(numOfImages) << "
" << endl; diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 95abf73..d8015ce 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -108,7 +108,7 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQString servicespath = TDEGlobal::dirs()->saveLocation( "services"); TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 030ac98..76dbd95 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -71,7 +71,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); TQPixmap icon; - icon = KGlobal::iconLoader()->loadIcon(iconPath, + icon = TDEGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) @@ -120,8 +120,8 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) { TQString fileName = (*it)->fileName(); diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 772f169..1b45791 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -75,7 +75,7 @@ void KTestMenu::slotFileTransfer( const TQString &uid ) { void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position - KGlobal::locale()->insertCatalogue("kuick_plugin"); + TDEGlobal::locale()->insertCatalogue("kuick_plugin"); bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 6375363..38e5c5d 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { - KGlobal::locale()->insertCatalogue("mf_konqplugin"); + TDEGlobal::locale()->insertCatalogue("mf_konqplugin"); m_part = dynamic_cast(parent); if (!m_part) { @@ -62,7 +62,7 @@ void KonqMFIcon::waitPartToLoad() { KonqMFIcon::~KonqMFIcon() { - KGlobal::locale()->removeCatalogue("mf_konqplugin"); + TDEGlobal::locale()->removeCatalogue("mf_konqplugin"); delete m_menu; m_menu = 0L; } diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 9460927..82d35eb 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -446,11 +446,11 @@ void SearchBarPlugin::useSearchProvider(int id) void SearchBarPlugin::selectSearchEngines() { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; *process << "kcmshell" << "ebrowsing"; - connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(searchEnginesSelected(KProcess *))); + connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *))); if(!process->start()) { @@ -459,7 +459,7 @@ void SearchBarPlugin::selectSearchEngines() } } -void SearchBarPlugin::searchEnginesSelected(KProcess *process) +void SearchBarPlugin::searchEnginesSelected(TDEProcess *process) { if(!process || process->exitStatus() == 0) { diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 3bd7ba7..fd1f846 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -32,7 +32,7 @@ #include class KHTMLPart; -class KProcess; +class TDEProcess; class TQPopupMenu; class TQTimer; @@ -140,7 +140,7 @@ class SearchBarPlugin : public KParts::Plugin void useFindInThisPage(); void useSearchProvider(int); void selectSearchEngines(); - void searchEnginesSelected(KProcess *process); + void searchEnginesSelected(TDEProcess *process); void configurationChanged(); /** diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 6f5d663..d4066c8 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -51,7 +51,7 @@ TQString BookmarkListItem::text( int column ) const if ( column == 0 ) return m_desc; else if ( column == 1 ) - return KGlobal::locale()->formatDateTime( m_dateTime ); + return TDEGlobal::locale()->formatDateTime( m_dateTime ); return TQString(); } diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 7caf899..20aaa26 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -47,7 +47,7 @@ MainWidget::MainWidget( KConfig * config, TQWidget * parent ) { loadTags(); - KIconLoader * il = KGlobal::iconLoader(); + KIconLoader * il = TDEGlobal::iconLoader(); btnRefreshTags->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); @@ -234,7 +234,7 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); - tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), + tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); @@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos TQPopupMenu * menu = new TQPopupMenu( this ); TQ_CHECK_PTR( menu ); - menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), + menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index b033e92..84843d7 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -71,7 +71,7 @@ extern "C" KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp, TQString &desktopname, const char *name ) { - KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); + TDEGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); return new KonqSidebarDelicious( instance, par, widp, desktopname, name ); } } diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ab6463b..fc281b4 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -53,7 +53,7 @@ extern "C" { KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { - KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); + TDEGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); } } diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 9839fd0..08e38a0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -11,7 +11,7 @@ Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQSt KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); - KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); + TDEGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); widget = new MetabarWidget(widgetParent, "metabarwidget"); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 5e5650d..fd8c02b 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -57,7 +57,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int urlList.clear(); urlList.append(url); - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 1ba4f94..87a3d00 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -256,7 +256,7 @@ namespace KSB_News { TQWidget *widp, TQString &desktopname, const char *name) { - KGlobal::locale()->insertCatalogue("konqsidebar_news"); + TDEGlobal::locale()->insertCatalogue("konqsidebar_news"); return new KonqSidebar_News(instance, par, widp, desktopname, name); } } diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index f216c18..f26e064 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -98,7 +98,7 @@ void UAChangerPlugin::parseDescFiles() struct utsname utsn; uname( &utsn ); - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); if ( languageList.count() ) { TQStringList::Iterator it = languageList.find(TQFL1("C")); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index c76f56c..a9c6d06 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -85,7 +85,7 @@ void PluginWebArchiver::slotSaveToArchive() archiveName.replace( "/", ""); archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); - archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; + archiveName = TDEGlobalSettings::documentPath() + "/" + archiveName + ".war" ; KURL url = KFileDialog::getSaveURL(archiveName, i18n("*.war *.tgz|Web Archives"), part->widget(), i18n("Save Page as Web-Archive") ); -- cgit v1.2.1