diff -Nru libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/debian/bzr-builder.manifest libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/debian/bzr-builder.manifest --- libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/debian/bzr-builder.manifest 2014-02-08 03:33:23.000000000 +0000 +++ libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/debian/bzr-builder.manifest 2014-02-25 12:19:17.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.2 deb-version 0.5.3+bzr95+201402080333 -lp:~lubuntu-dev/lxde/libqtxdg revid:git-v1:18699c178ed46e720bfd9fd57526d42e64074ce3 +# bzr-builder format 0.2 deb-version 0.5.3+bzr96+201402251219 +lp:~lubuntu-dev/lxde/libqtxdg revid:git-v1:48e366e433d9d8470637d980f1cc28d3d1e30eaf nest packaging lp:~lubuntu-dev/lxde/libqtxdg-debian debian revid:gilir@ubuntu.com-20131022200154-bqhdc3iuu82c04n6 diff -Nru libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/debian/changelog libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/debian/changelog --- libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/debian/changelog 2014-02-08 03:33:23.000000000 +0000 +++ libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/debian/changelog 2014-02-25 12:19:17.000000000 +0000 @@ -1,8 +1,8 @@ -libqtxdg (0.5.3+bzr95+201402080333~ubuntu14.04.1) trusty; urgency=low +libqtxdg (0.5.3+bzr96+201402251219~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Julien Lavergne Sat, 08 Feb 2014 03:33:23 +0000 + -- Julien Lavergne Tue, 25 Feb 2014 12:19:17 +0000 libqtxdg (0.0.1-1~ppa1) raring; urgency=low diff -Nru libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/qiconfix/qiconloader.cpp libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/qiconfix/qiconloader.cpp --- libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/qiconfix/qiconloader.cpp 2014-02-08 03:33:23.000000000 +0000 +++ libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/qiconfix/qiconloader.cpp 2014-02-25 12:19:16.000000000 +0000 @@ -74,7 +74,7 @@ #include #endif -QT_BEGIN_NAMESPACE +namespace QtXdg { Q_GLOBAL_STATIC(QIconLoader, iconLoaderInstance) @@ -704,6 +704,6 @@ } } -QT_END_NAMESPACE +} // QtXdg #endif //QT_NO_ICON diff -Nru libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/qiconfix/qiconloader_p.h libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/qiconfix/qiconloader_p.h --- libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/qiconfix/qiconloader_p.h 2014-02-08 03:33:23.000000000 +0000 +++ libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/qiconfix/qiconloader_p.h 2014-02-25 12:19:16.000000000 +0000 @@ -75,7 +75,7 @@ //#include "qt/qfactoryloader_p.h" #include -QT_BEGIN_NAMESPACE +namespace QtXdg { class QIconLoader; @@ -209,7 +209,7 @@ mutable QHash themeList; }; -QT_END_NAMESPACE +} // QtXdg #endif // QDESKTOPICON_P_H diff -Nru libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/xdgicon.cpp libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/xdgicon.cpp --- libqtxdg-0.5.3+bzr95+201402080333~ubuntu14.04.1/xdgicon.cpp 2014-02-08 03:33:23.000000000 +0000 +++ libqtxdg-0.5.3+bzr96+201402251219~ubuntu14.04.1/xdgicon.cpp 2014-02-25 12:19:16.000000000 +0000 @@ -95,7 +95,7 @@ void XdgIcon::setThemeName(const QString& themeName) { QIcon::setThemeName(themeName); - QIconLoader::instance()->updateSystemTheme(); + QtXdg::QIconLoader::instance()->updateSystemTheme(); } @@ -125,7 +125,7 @@ } else { QIcon *cachedIcon; if (!isAbsolute) - cachedIcon = new QIcon(new QIconLoaderEngineFixed(name)); + cachedIcon = new QIcon(new QtXdg::QIconLoaderEngineFixed(name)); else cachedIcon = new QIcon(iconName); qtIconCache()->insert(name, cachedIcon);