diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
| commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
| tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /konq-plugins/sidebar/delicious | |
| parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
| download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/delicious')
| -rw-r--r-- | konq-plugins/sidebar/delicious/bookmarkListItem.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/sidebar/delicious/mainWidget.cpp | 6 | ||||
| -rw-r--r-- | konq-plugins/sidebar/delicious/plugin.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
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 ); } } |