From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/privacy/kcmprivacydialog.ui | 28 +++++++++---------- kcontrol/privacy/kprivacymanager.cpp | 12 ++++---- kcontrol/privacy/kprivacymanager.h | 2 +- kcontrol/privacy/kprivacysettings.ui | 54 ++++++++++++++++++------------------ 4 files changed, 48 insertions(+), 48 deletions(-) (limited to 'kcontrol/privacy') diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index df79e2ec1..003cf235f 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -1,7 +1,7 @@ KCMPrivacyDialog Ralf Hoelzer - + KCMPrivacyDialog @@ -43,7 +43,7 @@ 0 - + splitter1 @@ -79,13 +79,13 @@ 0 - + 0 50 - + 32767 200 @@ -102,7 +102,7 @@ - + layout1 @@ -110,17 +110,17 @@ unnamed - + selectAllButton - + 80 0 - + 32767 32767 @@ -130,17 +130,17 @@ Select All - + selectNoneButton - + 80 0 - + 32767 32767 @@ -160,14 +160,14 @@ Maximum - + 80 20 - + cleanupButton @@ -179,7 +179,7 @@ 0 - + 32767 32767 diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index bbf5e088a..6df0d04f9 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails() bool KPrivacyManager::clearRunCommandHistory() const { - return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", "" ); + return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") ); } bool KPrivacyManager::clearAllCookies() const { - return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", "" ); + return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") ); } bool KPrivacyManager::clearSavedClipboardContents() @@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents() return true; } - return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", "" ); + return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") ); } bool KPrivacyManager::clearFormCompletion() const @@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const bool KPrivacyManager::clearQuickStartMenu() const { - return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", "" ); + return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") ); } bool KPrivacyManager::clearWebHistory() @@ -138,7 +138,7 @@ bool KPrivacyManager::clearWebHistory() } return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyClear(TQCString)", "" ); + "notifyClear(TQCString)", TQString("") ); } bool KPrivacyManager::clearFavIcons() @@ -161,7 +161,7 @@ bool KPrivacyManager::isApplicationRegistered(const TQString &appName) QCStringList regApps = kapp->dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it ) - if((*it).find(appName.latin1()) != -1) return true; + if((*it).tqfind(appName.latin1()) != -1) return true; return false; } diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h index 6d950c903..11d4941fe 100644 --- a/kcontrol/privacy/kprivacymanager.h +++ b/kcontrol/privacy/kprivacymanager.h @@ -27,7 +27,7 @@ @author Ralf Hoelzer */ -class KPrivacyManager : public QObject +class KPrivacyManager : public TQObject { Q_OBJECT public: diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui index 93afe5dff..ddcc93ec9 100644 --- a/kcontrol/privacy/kprivacysettings.ui +++ b/kcontrol/privacy/kprivacysettings.ui @@ -5,7 +5,7 @@ Licensed under the terms of the LGPL. Derived from AT&T's Privacy Bird settings panel screenshot originally. George Staikos <staikos@kde.org> - + KPrivacySettings @@ -38,7 +38,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Horizontal - + textLabel1 @@ -49,7 +49,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. _privacyLevel - + Low @@ -82,7 +82,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1_2 @@ -93,7 +93,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2 @@ -101,7 +101,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my financial or purchase information: - + _warnFinancialMarketeer @@ -109,7 +109,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. For marketing or advertising purposes - + _warnFinancialSpammer @@ -119,7 +119,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1 @@ -130,7 +130,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_2 @@ -138,7 +138,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my health or medical information: - + _warnHealthMarketeer @@ -146,7 +146,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. For marketing or advertising purposes - + _warnHealthSpammer @@ -156,7 +156,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + buttonGroup1_2_2 @@ -167,7 +167,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_3 @@ -175,7 +175,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that uses my non-personally identifiable information: - + _warnDemographicsBigBrother @@ -183,7 +183,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. To determine my interests, habits or general behavior - + _warnDemographicsSpammer @@ -193,7 +193,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + _warnSpammers @@ -201,7 +201,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that shares my personal information with other companies - + _warnShady @@ -209,7 +209,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that does not let me know what information they have about me - + buttonGroup4 @@ -220,7 +220,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + textLabel2_2_2 @@ -228,7 +228,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that may contact me about other products or services: - + textLabel2_2_2_2 @@ -236,7 +236,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Warn me when I visit a site that may use my personal information to: - + _warnPersonalHabits @@ -244,7 +244,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Determine my habits, interests or general behavior - + layout1 @@ -252,7 +252,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + _warnPersonalTelephone @@ -260,7 +260,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Via telephone - + _warnPersonalMail @@ -270,7 +270,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - + layout3 @@ -278,7 +278,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. unnamed - + _warnPersonalEmail @@ -286,7 +286,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. Via email - + _warnPersonalBigBrother -- cgit v1.2.1