From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- certmanager/kwatchgnupg/aboutdata.cpp | 6 +++--- certmanager/kwatchgnupg/aboutdata.h | 6 +++--- certmanager/kwatchgnupg/kwatchgnupgconfig.cpp | 14 +++++++------- certmanager/kwatchgnupg/kwatchgnupgconfig.h | 9 +++++---- certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 22 +++++++++++----------- certmanager/kwatchgnupg/kwatchgnupgmainwin.h | 9 +++++---- certmanager/kwatchgnupg/main.cpp | 6 +++--- certmanager/kwatchgnupg/tray.cpp | 6 +++--- certmanager/kwatchgnupg/tray.h | 7 ++++--- 9 files changed, 44 insertions(+), 41 deletions(-) (limited to 'certmanager/kwatchgnupg') diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp index 4bde52190..2759ee31f 100644 --- a/certmanager/kwatchgnupg/aboutdata.cpp +++ b/certmanager/kwatchgnupg/aboutdata.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h index 0e1f9f631..2a3324107 100644 --- a/certmanager/kwatchgnupg/aboutdata.h +++ b/certmanager/kwatchgnupg/aboutdata.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index c22be6b77..5edb1a422 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -66,9 +66,9 @@ static int log_level_to_int( const TQString& loglevel ) } } -KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) +KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n("Configure KWatchGnuPG"), - Ok|Cancel, Ok, parent, name ) + Ok|Cancel, Ok, tqparent, name ) { // tmp vars: TQWidget * w; @@ -168,7 +168,7 @@ void KWatchGnuPGConfig::loadConfig() mLoglenSB->setValue( config->readNumEntry( "MaxLogLen", 10000 ) ); mWordWrapCB->setChecked( config->readBoolEntry("WordWrap", false ) ); - config->setGroup( TQString::null ); + config->setGroup( TQString() ); enableButtonOK( false ); enableButtonApply( false ); } @@ -185,7 +185,7 @@ void KWatchGnuPGConfig::saveConfig() config->writeEntry( "MaxLogLen", mLoglenSB->value() ); config->writeEntry( "WordWrap", mWordWrapCB->isChecked() ); - config->setGroup( TQString::null ); + config->setGroup( TQString() ); config->sync(); enableButtonOK( false ); enableButtonApply( false ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h index c73f5f6db..ac72ce1ba 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,8 +42,9 @@ class KURLRequester; class KWatchGnuPGConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 ); + KWatchGnuPGConfig( TQWidget* tqparent, const char* name = 0 ); void loadConfig(); void saveConfig(); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 3b856ca15..01340ecd2 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -58,8 +58,8 @@ #define WATCHGNUPGBINARY "watchgnupg" #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket") -KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name ) - : KMainWindow( parent, name, WType_TopLevel ), mConfig(0) +KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* tqparent, const char* name ) + : KMainWindow( tqparent, name, WType_TopLevel ), mConfig(0) { createActions(); createGUI(); @@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow() void KWatchGnuPGMainWindow::slotClear() { mCentralWidget->clear(); - mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() @@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher() kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } mCentralWidget->append(tr("[%1] Log stopped") - .arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))); + .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate))); } mWatcher->clearArguments(); KConfig* config = kapp->config(); @@ -143,12 +143,12 @@ void KWatchGnuPGMainWindow::startWatcher() *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY); *mWatcher << "--force"; *mWatcher << config->readEntry("Socket", WATCHGNUPGSOCKET); - config->setGroup(TQString::null); + config->setGroup(TQString()); if( !mWatcher->start() ) { KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) ); } else { mCentralWidget->append( tr("[%1] Log started") - .arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) ); + .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); @@ -192,7 +192,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() void KWatchGnuPGMainWindow::slotWatcherExited() { - if( KMessageBox::questionYesNo( this, i18n("The watchgnupg logging process died.\nDo you want to try to restart it?"), TQString::null, i18n("Try Restart"), i18n("Do Not Try") ) == KMessageBox::Yes ) { + if( KMessageBox::questionYesNo( this, i18n("The watchgnupg logging process died.\nDo you want to try to restart it?"), TQString(), i18n("Try Restart"), i18n("Do Not Try") ) == KMessageBox::Yes ) { mCentralWidget->append( i18n("====== Restarting logging process =====") ); startWatcher(); } else { @@ -229,7 +229,7 @@ void KWatchGnuPGMainWindow::show() void KWatchGnuPGMainWindow::slotSaveAs() { - TQString filename = KFileDialog::getSaveFileName( TQString::null, TQString::null, + TQString filename = KFileDialog::getSaveFileName( TQString(), TQString(), this, i18n("Save Log to File") ); if( filename.isEmpty() ) return; TQFile file(filename); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index f37b24226..fc7776897 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,8 +42,9 @@ class TQTextEdit; class KWatchGnuPGMainWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 ); + KWatchGnuPGMainWindow( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~KWatchGnuPGMainWindow(); public slots: void slotWatcherExited(); diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index 7c25a8da0..cbd0dd178 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp index c58f1b123..f7740b2f1 100644 --- a/certmanager/kwatchgnupg/tray.cpp +++ b/certmanager/kwatchgnupg/tray.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h index 85695f8f5..6c94d85c0 100644 --- a/certmanager/kwatchgnupg/tray.h +++ b/certmanager/kwatchgnupg/tray.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,6 +40,7 @@ class KWatchGnuPGMainWindow; class KWatchGnuPGTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin ); virtual ~KWatchGnuPGTray(); -- cgit v1.2.1