summaryrefslogtreecommitdiffstats
path: root/katapult/plugins/catalogs/bookmarkcatalog
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:53 -0600
commita935c1de6f952a489a96a27cb897144b5d225ebe (patch)
treef18b873df3b93a00c8fc16844a30d1476434c03d /katapult/plugins/catalogs/bookmarkcatalog
parent155220cc57a9be0841398c81b35cd8b22b3156ba (diff)
downloadkatapult-a935c1de6f952a489a96a27cb897144b5d225ebe.tar.gz
katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katapult/plugins/catalogs/bookmarkcatalog')
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
index 4eda633..127caa5 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
@@ -35,7 +35,7 @@
TQPixmap ActionOpenBookmark::icon(int size) const
{
- return KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size);
+ return TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size);
}
TQString ActionOpenBookmark::text() const
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
index ae098f3..1d5a746 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
@@ -32,7 +32,7 @@ Bookmark::Bookmark(KBookmark _bookmark)
TQPixmap Bookmark::icon(int size) const
{
- return KGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size);
+ return TDEGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size);
}
KBookmark Bookmark::bookmark() const
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
index 4a67681..5c9b443 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
@@ -35,7 +35,7 @@ MozillaBookmark::MozillaBookmark(TQString _url, TQString _title, TQPixmap _icon)
TQPixmap MozillaBookmark::icon(int size) const
{
- return KGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size);
+ return TDEGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size);
}
TQString MozillaBookmark::url() const