diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/AuthDialog.cpp | 32 | ||||
| -rw-r--r-- | src/main.cpp | 16 |
5 files changed, 27 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 827b442..5ae2326 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ kde4_add_ui_files(policykit_SRCS AuthDialog.ui authdetails.ui) kde4_add_executable(polkit-kde-authentication-agent-1 ${policykit_SRCS}) target_link_libraries(polkit-kde-authentication-agent-1 - ${KDE4_KDEUI_LIBS} + ${KDE4_TDEUI_LIBS} ${POLKITQT-1_LIBRARIES} ) diff --git a/debian/changelog b/debian/changelog index 3024f27..85e6037 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ polkit-kde-1 (0.99.1-1) unstable; urgency=low * Bump Standards-Version to 3.9.4, no changes needed. [ Pino Toscano ] - * The rebuild changes the kdebase-runtime dependency to kde-runtime. + * The rebuild changes the tdebase-runtime dependency to kde-runtime. (Closes: #716849) * Update Vcs-* headers diff --git a/debian/control b/debian/control index 90e6735..9ce0fd3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Fathi Boudra <fabo@debian.org> Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.11), - kdelibs5-dev, libpolkit-qt-1-dev (>= 0.99.0) + tdelibs5-dev, libpolkit-qt-1-dev (>= 0.99.0) Standards-Version: 3.9.4 Section: libs Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/polkit-kde-1.git diff --git a/src/AuthDialog.cpp b/src/AuthDialog.cpp index 7363ae9..e90a851 100644 --- a/src/AuthDialog.cpp +++ b/src/AuthDialog.cpp @@ -28,7 +28,7 @@ #include <TQtGui/TQStandardItemModel> #include <KDebug> -#include <KToolInvocation> +#include <TDEToolInvocation> #include <KUser> #include <PolkitTQt1/Authority> @@ -71,20 +71,20 @@ AuthDialog::AuthDialog(const TQString &actionId, } // loads the standard key icon - TQPixmap icon = KIconLoader::global()->loadIcon("dialog-password", - KIconLoader::NoGroup, - KIconLoader::SizeHuge, - KIconLoader::DefaultState); + TQPixmap icon = TDEIconLoader::global()->loadIcon("dialog-password", + TDEIconLoader::NoGroup, + TDEIconLoader::SizeHuge, + TDEIconLoader::DefaultState); // create a painter to paint the action icon over the key icon TQPainter painter(&icon); const int iconSize = icon.size().width(); // the the emblem icon to size 32 int overlaySize = 32; // try to load the action icon - const TQPixmap pixmap = KIconLoader::global()->loadIcon(iconName, - KIconLoader::NoGroup, + const TQPixmap pixmap = TDEIconLoader::global()->loadIcon(iconName, + TDEIconLoader::NoGroup, overlaySize, - KIconLoader::DefaultState, + TDEIconLoader::DefaultState, TQStringList(), 0, true); @@ -215,12 +215,12 @@ void AuthDialog::createUserCB(const PolkitTQt1::Identity::List &identities) display = user.loginName(); } - KIcon icon; + TDEIcon icon; // load user icon face if (!user.faceIconPath().isEmpty()) { - icon = KIcon(user.faceIconPath()); + icon = TDEIcon(user.faceIconPath()); } else { - icon = KIcon("user-identity"); + icon = TDEIcon("user-identity"); } // appends the user item userCB->addItem(icon, display, qVariantFromValue<TQString> (identity.toString())); @@ -294,10 +294,10 @@ void AuthDialog::showEvent(TQShowEvent *event) KNotification::Persistent | KNotification::CloseWhenWidgetActivated); kDebug() << "Notificate: " << notification->eventId(); notification->setText(m_message); - TQPixmap icon = KIconLoader::global()->loadIcon("dialog-password", - KIconLoader::NoGroup, - KIconLoader::SizeHuge, - KIconLoader::DefaultState); + TQPixmap icon = TDEIconLoader::global()->loadIcon("dialog-password", + TDEIconLoader::NoGroup, + TDEIconLoader::SizeHuge, + TDEIconLoader::DefaultState); notification->setPixmap(icon); notification->setActions(TQStringList() << i18n("Switch to dialog") << i18n("Cancel")); @@ -366,7 +366,7 @@ AuthDetails::AuthDetails(const PolkitTQt1::Details &details, void AuthDetails::openUrl(const TQString& url) { - KToolInvocation::invokeBrowser(url); + TDEToolInvocation::invokeBrowser(url); } void AuthDetails::openAction(const TQString &url) diff --git a/src/main.cpp b/src/main.cpp index ec9ca54..414275d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,29 +18,29 @@ */ -#include <KCmdLineArgs> -#include <KAboutData> -#include <KLocale> -#include <KCrash> +#include <TDECmdLineArgs> +#include <TDEAboutData> +#include <TDELocale> +#include <TDECrash> #include "policykitkde.h" int main(int argc, char *argv[]) { - KAboutData aboutData("Polkit1AuthAgent", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.99.0", - ki18n("PolicyKit1-KDE"), KAboutData::License_GPL, + TDEAboutData aboutData("Polkit1AuthAgent", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.99.0", + ki18n("PolicyKit1-KDE"), TDEAboutData::License_GPL, ki18n("(c) 2009 Red Hat, Inc.")); aboutData.addAuthor(ki18n("Jaroslav Reznik"), ki18n("Maintainer"), "jreznik@redhat.com"); aboutData.setProductName("policykit-kde/polkit-kde-authentication-agent-1"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); if (!PolicyKitKDE::start()) { tqWarning("PolicyKitKDE is already running!\n"); return 0; } - KCrash::setFlags(KCrash::AutoRestart); + TDECrash::setFlags(TDECrash::AutoRestart); PolicyKitKDE agent; agent.disableSessionManagement(); |