summaryrefslogtreecommitdiffstats
path: root/certmanager/kwatchgnupg
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/kwatchgnupg')
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp20
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp62
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.h4
-rw-r--r--certmanager/kwatchgnupg/main.cpp8
4 files changed, 47 insertions, 47 deletions
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 6b186178..f92960bb 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -93,13 +93,13 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
mExeED = new KURLRequester( w );
glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 );
glay->addWidget( mExeED, row, 1 );
- connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
+ connect( mExeED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) );
++row;
mSocketED = new KURLRequester( w );
glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 );
glay->addWidget( mSocketED, row, 1 );
- connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) );
+ connect( mSocketED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) );
++row;
mLogLevelCB = new TQComboBox( false, w );
@@ -110,7 +110,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
mLogLevelCB->insertItem( i18n("Guru") );
glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 );
glay->addWidget( mLogLevelCB, row, 1 );
- connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) );
+ connect( mLogLevelCB, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()) );
vlay->addWidget( group );
@@ -134,21 +134,21 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w );
glay->addWidget( button, row, 2 );
- connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) );
- connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) );
+ connect( mLoglenSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetHistorySizeUnlimited()) );
++row;
mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w );
mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode
glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 );
- connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) );
+ connect( mWordWrapCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()) );
vlay->addWidget( group );
vlay->addStretch( 1 );
- connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) );
- connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) );
+ connect( this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotSave()) );
+ connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()) );
}
void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
void KWatchGnuPGConfig::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
void KWatchGnuPGConfig::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
config->writeEntry( "Executable", mExeED->url() );
config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 62f08218..647056ab 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -43,7 +43,7 @@
#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <kedittoolbar.h>
@@ -68,17 +68,17 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name
mCentralWidget->setTextFormat( TQTextEdit::LogText );
setCentralWidget( mCentralWidget );
- mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
- connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
- connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ),
- this, TQT_SLOT( slotReadStdout() ) );
+ mWatcher = new TDEProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
+ connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
+ connect( mWatcher, TQ_SIGNAL( readReady(TDEProcIO*) ),
+ this, TQ_SLOT( slotReadStdout() ) );
slotReadConfig();
mSysTray = new KWatchGnuPGTray( this );
mSysTray->show();
- connect( mSysTray, TQT_SIGNAL( quitSelected() ),
- this, TQT_SLOT( slotQuit() ) );
+ connect( mSysTray, TQ_SIGNAL( quitSelected() ),
+ this, TQ_SLOT( slotQuit() ) );
setAutoSaveSettings();
}
@@ -96,18 +96,18 @@ void KWatchGnuPGMainWindow::slotClear()
void KWatchGnuPGMainWindow::createActions()
{
(void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
- TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
+ this, TQ_SLOT( slotClear() ),
actionCollection(), "clear_log" );
- (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
- (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
- (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
- (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
- (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
- (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
+ (void)KStdAction::saveAs( this, TQ_SLOT(slotSaveAs()), actionCollection() );
+ (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() );
+ (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() );
+ (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() );
+ (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection());
+ (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection());
#if 0
(void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
- 0, this, TQT_SLOT( slotConfigure() ),
+ 0, this, TQ_SLOT( slotConfigure() ),
actionCollection(), "configure" );
#endif
@@ -127,18 +127,18 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars()
void KWatchGnuPGMainWindow::startWatcher()
{
- disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
if( mWatcher->isRunning() ) {
mWatcher->kill();
while( mWatcher->isRunning() ) {
- kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+ tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
mCentralWidget->append(i18n("[%1] Log stopped")
.arg( TQDateTime::currentDateTime().toString(TQt::ISODate)));
}
mWatcher->clearArguments();
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
*mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
*mWatcher << "--force";
@@ -150,8 +150,8 @@ void KWatchGnuPGMainWindow::startWatcher()
mCentralWidget->append( i18n("[%1] Log started")
.arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) );
}
- connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
}
void KWatchGnuPGMainWindow::setGnuPGConfig()
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
if ( !cconfig )
return;
//Q_ASSERT( cconfig );
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
TQStringList comps = cconfig->componentList();
for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout()
mSysTray->setAttention(true);
}
}
- TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) );
}
void KWatchGnuPGMainWindow::slotAckRead() {
@@ -251,18 +251,18 @@ void KWatchGnuPGMainWindow::slotSaveAs()
void KWatchGnuPGMainWindow::slotQuit()
{
- disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ),
- this, TQT_SLOT( slotWatcherExited() ) );
+ disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
+ this, TQ_SLOT( slotWatcherExited() ) );
mWatcher->kill();
- kapp->quit();
+ tdeApp->quit();
}
void KWatchGnuPGMainWindow::slotConfigure()
{
if( !mConfig ) {
mConfig = new KWatchGnuPGConfig( this, "config dialog" );
- connect( mConfig, TQT_SIGNAL( reconfigure() ),
- this, TQT_SLOT( slotReadConfig() ) );
+ connect( mConfig, TQ_SIGNAL( reconfigure() ),
+ this, TQ_SLOT( slotReadConfig() ) );
}
mConfig->loadConfig();
mConfig->exec();
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
void KWatchGnuPGMainWindow::slotReadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("LogWindow");
mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
?TQTextEdit::WidgetWidth
@@ -282,7 +282,7 @@ void KWatchGnuPGMainWindow::slotReadConfig()
bool KWatchGnuPGMainWindow::queryClose()
{
- if ( !kapp->sessionSaving() ) {
+ if ( !tdeApp->sessionSaving() ) {
hide();
return false;
}
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 6d08fe05..da0a1586 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -37,7 +37,7 @@
class KWatchGnuPGTray;
class KWatchGnuPGConfig;
-class KProcIO;
+class TDEProcIO;
class TQTextEdit;
class KWatchGnuPGMainWindow : public TDEMainWindow {
@@ -68,7 +68,7 @@ private:
void startWatcher();
void setGnuPGConfig();
- KProcIO* mWatcher;
+ TDEProcIO* mWatcher;
TQTextEdit* mCentralWidget;
KWatchGnuPGTray* mSysTray;
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index 975b45c7..b9f6237a 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -37,7 +37,7 @@
#include "aboutdata.h"
#include "kwatchgnupgmainwin.h"
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
@@ -45,7 +45,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-class KWatchGnuPGApplication : public KUniqueApplication {
+class KWatchGnuPGApplication : public TDEUniqueApplication {
public:
KWatchGnuPGApplication();
~KWatchGnuPGApplication();
@@ -55,7 +55,7 @@ private:
};
KWatchGnuPGApplication::KWatchGnuPGApplication()
- : KUniqueApplication(), mMainWin(0)
+ : TDEUniqueApplication(), mMainWin(0)
{
}
@@ -71,7 +71,7 @@ int KWatchGnuPGApplication::newInstance()
setMainWidget( mMainWin );
}
mMainWin->show();
- return KUniqueApplication::newInstance();
+ return TDEUniqueApplication::newInstance();
}
int main( int argc, char** argv )