summaryrefslogtreecommitdiffstats
path: root/kshowmail
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-24 15:59:03 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-24 15:59:03 -0500
commit9c02dbb59ce57c68dc177d9294b980bf114a3e11 (patch)
treeb1b40423c9be9a42a97cd0e8f3af3139aefb6fa0 /kshowmail
parent0b875800e452c97b1a3f25aba5f029a8c33a4b93 (diff)
downloadkshowmail-9c02dbb59ce57c68dc177d9294b980bf114a3e11.tar.gz
kshowmail-9c02dbb59ce57c68dc177d9294b980bf114a3e11.zip
Update to TDE R14 API
Diffstat (limited to 'kshowmail')
-rw-r--r--kshowmail/AlertDlg.ui16
-rw-r--r--kshowmail/Makefile.am14
-rw-r--r--kshowmail/alertdialog.cpp2
-rw-r--r--kshowmail/alertdialog.h4
-rw-r--r--kshowmail/configelem.cpp256
-rw-r--r--kshowmail/configelem.h128
-rw-r--r--kshowmail/configlist.cpp140
-rw-r--r--kshowmail/configlist.h50
-rw-r--r--kshowmail/decodeRFC2047.cpp36
-rw-r--r--kshowmail/decodeRFC2047.h16
-rw-r--r--kshowmail/encryption.cpp6
-rw-r--r--kshowmail/encryption.h8
-rw-r--r--kshowmail/filteritem.cpp12
-rw-r--r--kshowmail/filteritem.h20
-rw-r--r--kshowmail/filteritemcriteria.cpp58
-rw-r--r--kshowmail/filteritemcriteria.h18
-rw-r--r--kshowmail/filterlog.cpp38
-rw-r--r--kshowmail/filterlog.h30
-rw-r--r--kshowmail/filterlogentry.cpp30
-rw-r--r--kshowmail/filterlogentry.h32
-rw-r--r--kshowmail/filterlogview.cpp50
-rw-r--r--kshowmail/filterlogview.h18
-rw-r--r--kshowmail/filterlogviewdeleteditem.cpp12
-rw-r--r--kshowmail/filterlogviewdeleteditem.h26
-rw-r--r--kshowmail/filterlogviewmoveditem.cpp12
-rw-r--r--kshowmail/filterlogviewmoveditem.h28
-rw-r--r--kshowmail/headerfilter.cpp8
-rw-r--r--kshowmail/headerfilter.h18
-rw-r--r--kshowmail/kcmconfigs/Makefile.am4
-rw-r--r--kshowmail/kcmconfigs/accountsetupdialog.cpp104
-rw-r--r--kshowmail/kcmconfigs/accountsetupdialog.h34
-rw-r--r--kshowmail/kcmconfigs/accountsetupitem.cpp34
-rw-r--r--kshowmail/kcmconfigs/accountsetupitem.h46
-rw-r--r--kshowmail/kcmconfigs/configaccounts.cpp38
-rw-r--r--kshowmail/kcmconfigs/configaccounts.h30
-rw-r--r--kshowmail/kcmconfigs/configactions.cpp88
-rw-r--r--kshowmail/kcmconfigs/configactions.h44
-rw-r--r--kshowmail/kcmconfigs/configdisplay.cpp88
-rw-r--r--kshowmail/kcmconfigs/configdisplay.h64
-rw-r--r--kshowmail/kcmconfigs/configfilter.cpp92
-rw-r--r--kshowmail/kcmconfigs/configfilter.h40
-rw-r--r--kshowmail/kcmconfigs/configgeneral.cpp76
-rw-r--r--kshowmail/kcmconfigs/configgeneral.h54
-rw-r--r--kshowmail/kcmconfigs/configlog.cpp56
-rw-r--r--kshowmail/kcmconfigs/configlog.h54
-rw-r--r--kshowmail/kcmconfigs/configspamcheck.cpp40
-rw-r--r--kshowmail/kcmconfigs/configspamcheck.h34
-rw-r--r--kshowmail/kcmconfigs/encryption.cpp6
-rw-r--r--kshowmail/kcmconfigs/encryption.h8
-rw-r--r--kshowmail/kcmconfigs/filtercriteriawidget.cpp24
-rw-r--r--kshowmail/kcmconfigs/filtercriteriawidget.h22
-rw-r--r--kshowmail/kcmconfigs/filtersetupdialog.cpp66
-rw-r--r--kshowmail/kcmconfigs/filtersetupdialog.h32
-rw-r--r--kshowmail/kcmconfigs/filtersetupitem.cpp60
-rw-r--r--kshowmail/kcmconfigs/filtersetupitem.h32
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfigaccounts.desktop18
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfigactions.desktop18
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfigdisplay.desktop18
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfigfilter.desktop18
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfiggeneral.desktop18
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfiglog.desktop12
-rw-r--r--kshowmail/kcmconfigs/kshowmailconfigspamcheck.desktop18
-rw-r--r--kshowmail/kcmconfigs/mailboxwizard.cpp50
-rw-r--r--kshowmail/kcmconfigs/mailboxwizard.h42
-rw-r--r--kshowmail/kcmconfigs/mailboxwizardlistitem.cpp6
-rw-r--r--kshowmail/kcmconfigs/mailboxwizardlistitem.h14
-rw-r--r--kshowmail/kcmconfigs/senderlistdialog.cpp30
-rw-r--r--kshowmail/kcmconfigs/senderlistdialog.h24
-rw-r--r--kshowmail/kcmconfigs/tdewalletaccess.cpp (renamed from kshowmail/kcmconfigs/kwalletaccess.cpp)28
-rw-r--r--kshowmail/kcmconfigs/tdewalletaccess.h (renamed from kshowmail/kcmconfigs/kwalletaccess.h)18
-rw-r--r--kshowmail/kfeedback.cpp128
-rw-r--r--kshowmail/kfeedback.h90
-rw-r--r--kshowmail/kshowmail.cpp118
-rw-r--r--kshowmail/kshowmail.h56
-rw-r--r--kshowmail/kshowmaildoc.cpp16
-rw-r--r--kshowmail/kshowmaildoc.h10
-rw-r--r--kshowmail/kshowmaildock.cpp44
-rw-r--r--kshowmail/kshowmaildock.h14
-rw-r--r--kshowmail/kshowmailfeedback.cpp2
-rw-r--r--kshowmail/kshowmailview.cpp80
-rw-r--r--kshowmail/kshowmailview.h44
-rw-r--r--kshowmail/main.cpp22
-rw-r--r--kshowmail/senderlistfilter.cpp12
-rw-r--r--kshowmail/senderlistfilter.h20
-rw-r--r--kshowmail/serverdialog.cpp110
-rw-r--r--kshowmail/serverdialog.h34
-rw-r--r--kshowmail/showheaderdialog.cpp10
-rw-r--r--kshowmail/showheaderdialog.h8
-rw-r--r--kshowmail/showlistviewitem.cpp32
-rw-r--r--kshowmail/showlistviewitem.h34
-rw-r--r--kshowmail/showmaildialog.cpp22
-rw-r--r--kshowmail/showmaildialog.h16
-rw-r--r--kshowmail/showrecord.cpp134
-rw-r--r--kshowmail/showrecord.h52
-rw-r--r--kshowmail/showrecordelem.cpp130
-rw-r--r--kshowmail/showrecordelem.h92
-rw-r--r--kshowmail/tdewalletaccess.cpp (renamed from kshowmail/kwalletaccess.cpp)28
-rw-r--r--kshowmail/tdewalletaccess.h (renamed from kshowmail/kwalletaccess.h)18
-rw-r--r--kshowmail/types.h20
-rw-r--r--kshowmail/uniqueapp.cpp4
-rw-r--r--kshowmail/uniqueapp.h4
101 files changed, 2046 insertions, 2046 deletions
diff --git a/kshowmail/AlertDlg.ui b/kshowmail/AlertDlg.ui
index 506a530..b16d3d7 100644
--- a/kshowmail/AlertDlg.ui
+++ b/kshowmail/AlertDlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>AlertDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>AlertDlg</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="2" column="2">
+ <widget class="TQPushButton" row="2" column="2">
<property name="name">
<cstring>m_ButtonIgnore</cstring>
</property>
@@ -27,7 +27,7 @@
<string>Ignore</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_ButtonOk</cstring>
</property>
@@ -35,7 +35,7 @@
<string>Show main window</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>PixmapLabel2</cstring>
</property>
@@ -46,9 +46,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
- <cstring>QLabel_1</cstring>
+ <cstring>TQLabel_1</cstring>
</property>
<property name="font">
<font>
@@ -61,9 +61,9 @@
<string>New mail</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="2">
<property name="name">
- <cstring>QLabel_2</cstring>
+ <cstring>TQLabel_2</cstring>
</property>
<property name="font">
<font>
diff --git a/kshowmail/Makefile.am b/kshowmail/Makefile.am
index d306f37..d68a522 100644
--- a/kshowmail/Makefile.am
+++ b/kshowmail/Makefile.am
@@ -1,23 +1,23 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
bin_PROGRAMS = kshowmail
-## INCLUDES were found outside kdevelop specific part
+## INCLUDES were found outside tdevelop specific part
kshowmail_SOURCES = AlertDlg.ui alertdialog.cpp configelem.cpp configlist.cpp \
decodeRFC2047.cpp encryption.cpp filteritem.cpp filteritemcriteria.cpp filterlog.cpp \
filterlogentry.cpp headerfilter.cpp kfeedback.cpp kshowmail.cpp kshowmaildoc.cpp \
- kshowmaildock.cpp kshowmailfeedback.cpp kshowmailview.cpp kwalletaccess.cpp main.cpp \
+ kshowmaildock.cpp kshowmailfeedback.cpp kshowmailview.cpp tdewalletaccess.cpp main.cpp \
senderlistfilter.cpp serverdialog.cpp showheaderdialog.cpp showlistviewitem.cpp \
showmaildialog.cpp showrecord.cpp showrecordelem.cpp uniqueapp.cpp filterlogview.cpp \
filterlogviewdeleteditem.cpp filterlogviewmoveditem.cpp
-kshowmail_LDADD = $(LIB_KUTILS) -lmimelib $(LIB_KFILE) $(LIB_KDEUI) \
- $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lkwalletclient -lDCOP
+kshowmail_LDADD = $(LIB_KUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \
+ $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -ltdewalletclient -lDCOP
EXTRA_DIST = main.cpp kshowmail.cpp kshowmail.h kshowmaildoc.cpp kshowmaildoc.h commandentry.cpp commandentry.h kshowmailview.cpp kshowmailview.h OptionDlg.ui OptionDlg.h optiondialog.cpp optiondialog.h ServerDlg.ui serverdialog.cpp serverdialog.h EditDlg.ui editdialog.cpp editdialog.h commanddialog.cpp commanddialog.h CommandDlg.ui commandlist.cpp commandlist.h CommandEntryDlg.ui commandentrydialog.cpp commandentrydialog.h configelem.cpp configelem.h kshowmaildock.cpp kshowmaildock.h configlist.cpp configlist.h AlertDlg.ui alertdialog.cpp alertdialog.h uniqueapp.cpp uniqueapp.h showrecordelem.cpp showrecordelem.h showrecord.cpp showrecord.h kshowmail.desktop decodeRFC2047.h decodeRFC2047.cpp showlistviewitem.cpp showlistviewitem.h kfeedback.cpp kfeedback.h kshowmailfeedback.cpp filter.cpp filter.h filterelem.cpp filterelem.h filterdialog.cpp filterdialog.h FilterDlg.ui FilterEntryDlg.ui filterentrydialog.cpp filterentrydialog.h filterlist.cpp filterlist.h logger.cpp logger.h
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
# this 10 paths are KDE specific. Use them:
# kde_htmldir Where your docs should go to. (contains lang subdirs)
# kde_appsdir Where your application file (.kdelnk) should go to.
@@ -49,7 +49,7 @@ messages: rc.cpp
fi
noinst_HEADERS = constants.h encryption.h filteritem.h filteritemcriteria.h \
- filterlog.h filterlogentry.h headerfilter.h kshowmail.desktop kwalletaccess.h \
+ filterlog.h filterlogentry.h headerfilter.h kshowmail.desktop tdewalletaccess.h \
senderlistfilter.h showheaderdialog.h showmaildialog.h types.h filterlogview.h \
filterlogviewdeleteditem.h filterlogviewmoveditem.h
diff --git a/kshowmail/alertdialog.cpp b/kshowmail/alertdialog.cpp
index b80f976..5805fba 100644
--- a/kshowmail/alertdialog.cpp
+++ b/kshowmail/alertdialog.cpp
@@ -17,7 +17,7 @@
#include "alertdialog.h"
-AlertDialog::AlertDialog(QWidget *parent, const char *name ):
+AlertDialog::AlertDialog(TQWidget *parent, const char *name ):
AlertDlg(parent,name,true)
{
// position the dialog at the upper left corner of the main window.
diff --git a/kshowmail/alertdialog.h b/kshowmail/alertdialog.h
index ba1cb2b..92fce8d 100644
--- a/kshowmail/alertdialog.h
+++ b/kshowmail/alertdialog.h
@@ -18,7 +18,7 @@
#ifndef ALERTDIALOG_H
#define ALERTDIALOG_H
-#include <qwidget.h>
+#include <ntqwidget.h>
#include "AlertDlg.h"
/**
@@ -29,7 +29,7 @@ class AlertDialog : public AlertDlg
{
Q_OBJECT
public:
- AlertDialog(QWidget *parent=0, const char *name=0);
+ AlertDialog(TQWidget *parent=0, const char *name=0);
~AlertDialog();
public slots:
void slotOk ();
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 9941c75..356e726 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -21,7 +21,7 @@ int const ConfigElem::continueShowHeaders( 0 );
int const ConfigElem::cancelShowHeaders( 1 );
-ConfigElem::ConfigElem( ) : QObject()
+ConfigElem::ConfigElem( ) : TQObject()
{
//initialize account
init();
@@ -34,7 +34,7 @@ ConfigElem::ConfigElem( ) : QObject()
m_strAccount = "";
}
-ConfigElem::ConfigElem( ConfigList* config ) : QObject()
+ConfigElem::ConfigElem( ConfigList* config ) : TQObject()
{
//initialize account
init();
@@ -48,7 +48,7 @@ ConfigElem::ConfigElem( ConfigList* config ) : QObject()
}
-ConfigElem::ConfigElem( ConfigElem* pElem ) : QObject()
+ConfigElem::ConfigElem( ConfigElem* pElem ) : TQObject()
{
//initialize account
init();
@@ -64,7 +64,7 @@ ConfigElem::ConfigElem( ConfigElem* pElem ) : QObject()
}
-ConfigElem::ConfigElem( ConfigList* config, const QString& account ) : QObject()
+ConfigElem::ConfigElem( ConfigList* config, const TQString& account ) : TQObject()
{
//initialize account
init();
@@ -82,7 +82,7 @@ ConfigElem::ConfigElem( ConfigList* config, const QString& account ) : QObject()
void ConfigElem::init( )
{
//initialize timeout timer
- pop3Timer = new QTimer( this );
+ pop3Timer = new TQTimer( this );
connect( pop3Timer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) );
//state is idle
@@ -116,10 +116,10 @@ ConfigElem::~ConfigElem()
// do not delete m_pshowrecord here
}
-void ConfigElem::saveOptions( QDomDocument& doc, QDomElement& parent )
+void ConfigElem::saveOptions( TQDomDocument& doc, TQDomElement& parent )
{
//get application config
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
//save the active state
config->setGroup( getAccountName() );
@@ -131,7 +131,7 @@ void ConfigElem::saveOptions( QDomDocument& doc, QDomElement& parent )
m_pshowrecord->saveOptions( doc, parent );
}
-void ConfigElem::readStoredMails( QDomElement& parent )
+void ConfigElem::readStoredMails( TQDomElement& parent )
{
//get mails
m_pshowrecord->readStoredMails( parent );
@@ -153,23 +153,23 @@ void ConfigElem::setActive( bool active )
m_bActive = active;
}
-QString ConfigElem::getAccountName( ) const
+TQString ConfigElem::getAccountName( ) const
{
return m_strAccount;
}
-void ConfigElem::setAccountName( QString name )
+void ConfigElem::setAccountName( TQString name )
{
if( name != NULL )
m_strAccount = name;
}
-QString ConfigElem::getPassword( ) const
+TQString ConfigElem::getPassword( ) const
{
return m_url.pass();
}
-void ConfigElem::setPassword( const QString& password )
+void ConfigElem::setPassword( const TQString& password )
{
m_url.setPass( password );
}
@@ -184,12 +184,12 @@ bool ConfigElem::hasPassword( ) const
return m_url.hasPass();
}
-void ConfigElem::setListViewItem( QListViewItem* item )
+void ConfigElem::setListViewItem( TQListViewItem* item )
{
m_pViewItem = item;
}
-QListViewItem * ConfigElem::getListViewItem( )
+TQListViewItem * ConfigElem::getListViewItem( )
{
return m_pViewItem;
}
@@ -215,12 +215,12 @@ void ConfigElem::clearMailList( )
m_pshowrecord->clear();
}
-void ConfigElem::setHost( const QString& host )
+void ConfigElem::setHost( const TQString& host )
{
m_url.setHost( host );
}
-void ConfigElem::setProtocol( const QString& protocol )
+void ConfigElem::setProtocol( const TQString& protocol )
{
m_url.setProtocol( protocol );
}
@@ -230,17 +230,17 @@ void ConfigElem::setPort( unsigned short int port )
m_url.setPort( port );
}
-void ConfigElem::setUser( const QString & user )
+void ConfigElem::setUser( const TQString & user )
{
m_url.setUser( user );
}
-QString ConfigElem::getUser( ) const
+TQString ConfigElem::getUser( ) const
{
return m_url.user();
}
-QString ConfigElem::getHost( ) const
+TQString ConfigElem::getHost( ) const
{
return m_url.host();
}
@@ -287,14 +287,14 @@ bool ConfigElem::assertPassword( bool force )
{
//no password found, we will ask the user!
//set normal cursor
- while( QApplication::overrideCursor() )
- QApplication::restoreOverrideCursor();
+ while( TQApplication::overrideCursor() )
+ TQApplication::restoreOverrideCursor();
- QCString password; //for the password dialog to store the password
+ TQCString password; //for the password dialog to store the password
int result = KPasswordDialog::getPassword( password, i18n( "Please type in the password for %1" ).arg( getAccountName() ) );
//set waiting cursor
- QApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
//let's look, what the user has done :o)
if( result == KPasswordDialog::Accepted )
@@ -304,13 +304,13 @@ bool ConfigElem::assertPassword( bool force )
setPassword( password );
//save password in file or KWallet
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
config->setGroup( getAccountName() );
if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, crypt( m_url ) );
else
- config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, QString::null );
+ config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
KWalletAccess::savePassword( getAccountName(), m_url.pass() );
@@ -350,11 +350,11 @@ void ConfigElem::deleteNextMail( )
}
//start job
- startKIOJob( QString( "/remove/%1" ).arg( *MailsToDelete.begin() ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotMailDeleted( KIO::Job* ) ) );
+ startKIOJob( TQString( "/remove/%1" ).arg( *MailsToDelete.begin() ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotMailDeleted( TDEIO::Job* ) ) );
}
-void ConfigElem::slotMailDeleted( KIO::Job* job )
+void ConfigElem::slotMailDeleted( TDEIO::Job* job )
{
//stop timeout timer
pop3Timer->stop();
@@ -362,7 +362,7 @@ void ConfigElem::slotMailDeleted( KIO::Job* job )
//check for errors
//if an error is occured, the deletion will be canceled
//or will ask for a new password
- if( job->error() == KIO::ERR_COULD_NOT_LOGIN )
+ if( job->error() == TDEIO::ERR_COULD_NOT_LOGIN )
{
//login failed, ask for a new password
job->showErrorDialog();
@@ -426,7 +426,7 @@ void ConfigElem::slotMailDeleted( KIO::Job* job )
}
-void ConfigElem::slotFinalizeDeletion( KIO::Job* )
+void ConfigElem::slotFinalizeDeletion( TDEIO::Job* )
{
//stop timeout time
pop3Timer->stop();
@@ -438,9 +438,9 @@ void ConfigElem::slotFinalizeDeletion( KIO::Job* )
emit sigDeleteReady( m_strAccount );
}
-void ConfigElem::startKIOJob( const QString & path )
+void ConfigElem::startKIOJob( const TQString & path )
{
- KIO::MetaData options; //options for the pop3 job
+ TDEIO::MetaData options; //options for the pop3 job
//set options
options.insert( "progress", "off" );
@@ -452,7 +452,7 @@ void ConfigElem::startKIOJob( const QString & path )
options.insert( "tls", "off" );
//Where is secure login?
- //I have decided against a configurable secure login because the used POP3 kioslave
+ //I have decided against a configurable secure login because the used POP3 tdeioslave
//always tries to login with APOP, if the server has sent a timestap (inside of the greeting string) for this authentification type.
//It just follows the auth-metadata, if the server doesn't support APOP (no timestamp inside of the greeting string).
//But I think, there is no server, which support a SASL authentification without also provide APOP.
@@ -465,7 +465,7 @@ void ConfigElem::startKIOJob( const QString & path )
kdDebug() << "ConfigElem::startKIOJob: start KIO job on URL " << m_url.url() << endl;
//start the job and get handle to it
- pop3Job = KIO::get( m_url, false, false );
+ pop3Job = TDEIO::get( m_url, false, false );
//put options to the job
pop3Job->addMetaData( options );
@@ -482,8 +482,8 @@ Types::AccountState_Type ConfigElem::getState( )
void ConfigElem::commitDeletion( )
{
//start job to commit
- startKIOJob( QString( "/commit" ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotFinalizeDeletion( KIO::Job* ) ) );
+ startKIOJob( TQString( "/commit" ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeDeletion( TDEIO::Job* ) ) );
}
unsigned int ConfigElem::getTimeoutTime( )
@@ -512,7 +512,7 @@ void ConfigElem::slotTimeout( )
kdError() << "Timeout error!" << endl;
if( state != AccountRefreshing || appConfig->showConnectionErrors() )
- KMessageBox::error( NULL, QString( i18n( "Time out on %1. The operation could not be finished on time" ) ).arg( m_strAccount ), i18n( "Time Out" ) );
+ KMessageBox::error( NULL, TQString( i18n( "Time out on %1. The operation could not be finished on time" ) ).arg( m_strAccount ), i18n( "Time Out" ) );
//call the appropriate finalize methode
switch( state )
@@ -526,7 +526,7 @@ void ConfigElem::slotTimeout( )
}
}
-QStringList ConfigElem::getSelectedSubjects( ) const
+TQStringList ConfigElem::getSelectedSubjects( ) const
{
return m_pshowrecord->getSelectedSubjects();
}
@@ -585,13 +585,13 @@ void ConfigElem::showNextMail( )
mailbody.resize( 0 );
//start job
- startKIOJob( QString( "/download/%1" ).arg( *MailsToShow.begin() ) );
- connect( pop3Job, SIGNAL( data( KIO::Job*, const QByteArray & ) ), SLOT( slotDataMailBody( KIO::Job*, const QByteArray & ) ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotBodyDownloaded( KIO::Job* ) ) );
+ startKIOJob( TQString( "/download/%1" ).arg( *MailsToShow.begin() ) );
+ connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotBodyDownloaded( TDEIO::Job* ) ) );
}
-void ConfigElem::slotBodyDownloaded( KIO::Job * job )
+void ConfigElem::slotBodyDownloaded( TDEIO::Job * job )
{
//stop timeout timer
pop3Timer->stop();
@@ -599,7 +599,7 @@ void ConfigElem::slotBodyDownloaded( KIO::Job * job )
//check for errors
//if an error has occured, the download will be canceled
//or will ask for a new password
- if( job->error() == KIO::ERR_COULD_NOT_LOGIN )
+ if( job->error() == TDEIO::ERR_COULD_NOT_LOGIN )
{
//login failed, ask for a new password
job->showErrorDialog();
@@ -623,11 +623,11 @@ void ConfigElem::slotBodyDownloaded( KIO::Job * job )
//succesful download
//show mail
int currentMail = *MailsToShow.begin();
- QString tsender = m_pshowrecord->getSenderOf( currentMail );
- QString tdate = m_pshowrecord->getDateOf( currentMail );
- QString tsize = m_pshowrecord->getSizeOf( currentMail );
- QString tsubject = m_pshowrecord->getSubjectOf( currentMail );
- QString tmailbody( m_pshowrecord->decodeMailBody( mailbody, currentMail, appConfig->allowHTML() ) );
+ TQString tsender = m_pshowrecord->getSenderOf( currentMail );
+ TQString tdate = m_pshowrecord->getDateOf( currentMail );
+ TQString tsize = m_pshowrecord->getSizeOf( currentMail );
+ TQString tsubject = m_pshowrecord->getSubjectOf( currentMail );
+ TQString tmailbody( m_pshowrecord->decodeMailBody( mailbody, currentMail, appConfig->allowHTML() ) );
//emit signal to notify the opening of a window
emit sigMessageWindowOpened();
@@ -663,7 +663,7 @@ void ConfigElem::slotBodyDownloaded( KIO::Job * job )
showNextMail();
}
-void ConfigElem::slotFinalizeShowMail( KIO::Job* )
+void ConfigElem::slotFinalizeShowMail( TDEIO::Job* )
{
//stop timeout time
pop3Timer->stop();
@@ -675,7 +675,7 @@ void ConfigElem::slotFinalizeShowMail( KIO::Job* )
emit sigShowBodiesReady( m_strAccount );
}
-void ConfigElem::slotDataMailBody( KIO::Job *, const QByteArray & datas )
+void ConfigElem::slotDataMailBody( TDEIO::Job *, const TQByteArray & datas )
{
if( !datas.isEmpty() )
{
@@ -691,8 +691,8 @@ void ConfigElem::slotDataMailBody( KIO::Job *, const QByteArray & datas )
void ConfigElem::commitDownloading( )
{
//start job to commit
- startKIOJob( QString( "/commit" ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotFinalizeShowMail( KIO::Job* ) ) );
+ startKIOJob( TQString( "/commit" ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeShowMail( TDEIO::Job* ) ) );
}
void ConfigElem::refreshMailList( FilterLog* log )
@@ -739,32 +739,32 @@ void ConfigElem::refreshMailList( FilterLog* log )
void ConfigElem::getUIDs( )
{
- //clears the QString list, which contains all received UIDs
+ //clears the TQString list, which contains all received UIDs
receivedUIDs.clear();
//start job
- startKIOJob( QString( "/uidl" ) );
- connect( pop3Job, SIGNAL( data( KIO::Job*, const QByteArray & ) ), SLOT( slotReceiveUID( KIO::Job*, const QByteArray & ) ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotUIDsReceived( KIO::Job* ) ) );
+ startKIOJob( TQString( "/uidl" ) );
+ connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotReceiveUID( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotUIDsReceived( TDEIO::Job* ) ) );
}
-void ConfigElem::slotReceiveUID( KIO::Job*, const QByteArray& data )
+void ConfigElem::slotReceiveUID( TDEIO::Job*, const TQByteArray& data )
{
//return, when data is empty
if( data.isEmpty() ) return;
- //cast the data to QString
- QString uid( data );
+ //cast the data to TQString
+ TQString uid( data );
//insert the uid at the end of the UID list
receivedUIDs.append( uid );
}
-void ConfigElem::slotUIDsReceived( KIO::Job * job )
+void ConfigElem::slotUIDsReceived( TDEIO::Job * job )
{
int number; //an extracted mail number
- QString uid; //an extracted uid
+ TQString uid; //an extracted uid
bool corruptData = false; //set to TRUE, if a data is corrupt
bool isNew = false; //state of the received mail
@@ -774,7 +774,7 @@ void ConfigElem::slotUIDsReceived( KIO::Job * job )
//check for errors
//if an error has occured, the refresh will be canceled
//or will ask for a new password
- if( job->error() == KIO::ERR_COULD_NOT_LOGIN )
+ if( job->error() == TDEIO::ERR_COULD_NOT_LOGIN )
{
//login failed, ask for a new password
job->showErrorDialog();
@@ -805,9 +805,9 @@ void ConfigElem::slotUIDsReceived( KIO::Job * job )
if( !receivedUIDs.isEmpty() )
{
//iterate over all UIDs in the list
- for ( QStringList::Iterator it = receivedUIDs.begin(); it != receivedUIDs.end(); ++it )
+ for ( TQStringList::Iterator it = receivedUIDs.begin(); it != receivedUIDs.end(); ++it )
{
- QString line = *it;
+ TQString line = *it;
//every line has the format "number UID", e.g.: 1 bf10d38018de7c1d628d65288d722f6a
//get the position of the separating space
@@ -816,7 +816,7 @@ void ConfigElem::slotUIDsReceived( KIO::Job * job )
//if no space was found, the line is corrupt
if( positionOfSpace == -1 )
{
- kdError() << "ConfigElem::slotUIDsReceived: get a corrupt UID from " << dynamic_cast<KIO::SimpleJob*>(job)->url().host() << ". No space. : " << line << endl;
+ kdError() << "ConfigElem::slotUIDsReceived: get a corrupt UID from " << dynamic_cast<TDEIO::SimpleJob*>(job)->url().host() << ". No space. : " << line << endl;
corruptData = true;
}
else
@@ -828,7 +828,7 @@ void ConfigElem::slotUIDsReceived( KIO::Job * job )
if( !isNumber )
{
//the first part is not a number
- kdError() << "ConfigElem::slotUIDsReceived: get a corrupt UID from " << dynamic_cast<KIO::SimpleJob*>(job)->url().host() << ". No number found at begin. : " << line << endl;
+ kdError() << "ConfigElem::slotUIDsReceived: get a corrupt UID from " << dynamic_cast<TDEIO::SimpleJob*>(job)->url().host() << ". No number found at begin. : " << line << endl;
corruptData = true;
}
else
@@ -896,7 +896,7 @@ void ConfigElem::cancelRefresh()
//we don't need an error message, because the KIO job has shown one
}
-void ConfigElem::slotFinalizeRefresh( KIO::Job* )
+void ConfigElem::slotFinalizeRefresh( TDEIO::Job* )
{
//stop timeout time
pop3Timer->stop();
@@ -916,23 +916,23 @@ void ConfigElem::slotFinalizeRefresh( KIO::Job* )
void ConfigElem::commitRefresh( )
{
//start job to commit
- startKIOJob( QString( "/commit" ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotFinalizeRefresh( KIO::Job* ) ) );
+ startKIOJob( TQString( "/commit" ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeRefresh( TDEIO::Job* ) ) );
}
void ConfigElem::getSizes( )
{
- //clears the QString list, which contains all received UIDs
+ //clears the TQString list, which contains all received UIDs
receivedSizes.clear();
//start job
- startKIOJob( QString( "/index" ) );
- connect( pop3Job, SIGNAL( data( KIO::Job*, const QByteArray & ) ), SLOT( slotReceiveSize( KIO::Job*, const QByteArray & ) ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotSizesReceived( KIO::Job* ) ) );
+ startKIOJob( TQString( "/index" ) );
+ connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotReceiveSize( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotSizesReceived( TDEIO::Job* ) ) );
}
-void ConfigElem::slotSizesReceived( KIO::Job * job )
+void ConfigElem::slotSizesReceived( TDEIO::Job * job )
{
int number; //an extracted mail number
long size; //an extracted size
@@ -956,9 +956,9 @@ void ConfigElem::slotSizesReceived( KIO::Job * job )
if( !receivedSizes.isEmpty() )
{
//iterate over all sizes in the list
- for ( QStringList::Iterator it = receivedSizes.begin(); it != receivedSizes.end(); ++it )
+ for ( TQStringList::Iterator it = receivedSizes.begin(); it != receivedSizes.end(); ++it )
{
- QString line = *it;
+ TQString line = *it;
//every line has the format "number size", e.g.: 1 1234
//get the position of the separating space
@@ -967,7 +967,7 @@ void ConfigElem::slotSizesReceived( KIO::Job * job )
//if no space was found, the line is corrupt
if( positionOfSpace == -1 )
{
- kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<KIO::SimpleJob*>(job)->url().host() << ". No space. : " << line << endl;
+ kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<TDEIO::SimpleJob*>(job)->url().host() << ". No space. : " << line << endl;
corruptData = true;
}
else
@@ -979,7 +979,7 @@ void ConfigElem::slotSizesReceived( KIO::Job * job )
if( !isNumber )
{
//the first part is not a number
- kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<KIO::SimpleJob*>(job)->url().host() << ". No number found at begin. : " << line << endl;
+ kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<TDEIO::SimpleJob*>(job)->url().host() << ". No number found at begin. : " << line << endl;
corruptData = true;
}
else
@@ -991,7 +991,7 @@ void ConfigElem::slotSizesReceived( KIO::Job * job )
if( !isNumber )
{
//the second part of the string is not a number
- kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<KIO::SimpleJob*>(job)->url().host() << ". No size found at end. : " << line << endl;
+ kdError() << "ConfigElem::slotSizesReceived: get a corrupt size from " << dynamic_cast<TDEIO::SimpleJob*>(job)->url().host() << ". No size found at end. : " << line << endl;
corruptData = true;
}
else
@@ -1013,13 +1013,13 @@ void ConfigElem::slotSizesReceived( KIO::Job * job )
}
}
-void ConfigElem::slotReceiveSize( KIO::Job *, const QByteArray & data )
+void ConfigElem::slotReceiveSize( TDEIO::Job *, const TQByteArray & data )
{
//return, when data is empty
if( data.isEmpty() ) return;
- //cast the data to QString
- QString size( data );
+ //cast the data to TQString
+ TQString size( data );
//insert the uid at the end of the sizes list
receivedSizes.append( size );
@@ -1054,13 +1054,13 @@ void ConfigElem::getNextHeader( )
receivedHeader.resize( 0 );
//start job
- startKIOJob( QString( "/headers/%1" ).arg( *newMails.begin() ) );
- connect( pop3Job, SIGNAL( data( KIO::Job*, const QByteArray & ) ), this, SLOT( slotReceiveHeader( KIO::Job*, const QByteArray & ) ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotHeaderDownloaded( KIO::Job* ) ) );
+ startKIOJob( TQString( "/headers/%1" ).arg( *newMails.begin() ) );
+ connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, SLOT( slotReceiveHeader( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotHeaderDownloaded( TDEIO::Job* ) ) );
}
-void ConfigElem::slotHeaderDownloaded( KIO::Job * job )
+void ConfigElem::slotHeaderDownloaded( TDEIO::Job * job )
{
//stop timeout timer
pop3Timer->stop();
@@ -1078,7 +1078,7 @@ void ConfigElem::slotHeaderDownloaded( KIO::Job * job )
}
//store header
- tempMailList->setHeader( *newMails.begin(), QString( receivedHeader ) );
+ tempMailList->setHeader( *newMails.begin(), TQString( receivedHeader ) );
//remove the first item of the list of new mails
newMails.remove( newMails.begin() );
@@ -1097,14 +1097,14 @@ void ConfigElem::slotHeaderDownloaded( KIO::Job * job )
void ConfigElem::copyHeaders( )
{
//get the UIDs of the old mails in the temporary mail list
- QStringList UIDs = tempMailList->getUIDsOfOldMails();
+ TQStringList UIDs = tempMailList->getUIDsOfOldMails();
//iterate over all members of the list,
//get the header from the old list and store it in the new one
- QStringList::iterator it;
+ TQStringList::iterator it;
for ( it = UIDs.begin(); it != UIDs.end(); ++it )
{
- QString header = m_pshowrecord->getHeaderOf( *it );
+ TQString header = m_pshowrecord->getHeaderOf( *it );
tempMailList->setHeader( *it, header );
}
@@ -1112,7 +1112,7 @@ void ConfigElem::copyHeaders( )
swapMailLists();
}
-void ConfigElem::slotReceiveHeader( KIO::Job *, const QByteArray & data )
+void ConfigElem::slotReceiveHeader( TDEIO::Job *, const TQByteArray & data )
{
if( !data.isEmpty() )
{
@@ -1151,13 +1151,13 @@ void ConfigElem::refreshAccountListItem( )
{
if( isActive() )
{
- m_pViewItem->setText( 4, QString( "%1" ).arg( getNumberMails(), 3 ) );
- m_pViewItem->setText( 5, QString( "%1" ).arg( getTotalSize(), 8 ) );
+ m_pViewItem->setText( 4, TQString( "%1" ).arg( getNumberMails(), 3 ) );
+ m_pViewItem->setText( 5, TQString( "%1" ).arg( getTotalSize(), 8 ) );
}
else
{
- m_pViewItem->setText( 4, QString( "???" ) );
- m_pViewItem->setText( 5, QString( "???" ) );
+ m_pViewItem->setText( 4, TQString( "???" ) );
+ m_pViewItem->setText( 5, TQString( "???" ) );
}
}
}
@@ -1239,7 +1239,7 @@ int ConfigElem::getPasswordStorage( ) const
return PasswordStorage;
}
-QString ConfigElem::getProtocol( bool upperCase ) const
+TQString ConfigElem::getProtocol( bool upperCase ) const
{
if( upperCase )
return m_url.protocol().upper();
@@ -1377,65 +1377,65 @@ void ConfigElem::applyFiltersDeleted( )
}
-bool ConfigElem::writeToMailBox( const QString & mail, const QString & box )
+bool ConfigElem::writeToMailBox( const TQString & mail, const TQString & box )
{
- QDir mailDir( box );
+ TQDir mailDir( box );
//check whether the given path is a maildir
if( !isMailDir( mailDir ) )
{
//show an error message
- KMessageBox::error( NULL, i18n( QString( "%1 is not a mailbox." ).arg( box ) ) );
+ KMessageBox::error( NULL, i18n( TQString( "%1 is not a mailbox." ).arg( box ) ) );
return false;
}
//create unique file name according http://cr.yp.to/proto/maildir.html
- QString partTime = QString::number( time( NULL ) ); //left part, output of time()
+ TQString partTime = TQString::number( time( NULL ) ); //left part, output of time()
char hname[256]; //right part, the hostname
- QString partHostname;
+ TQString partHostname;
if( gethostname( hname, 255 ) == 0 )
- partHostname = QString( hname );
+ partHostname = TQString( hname );
else
{
//the hostname is not readable
//show an error message and exit
- KMessageBox::error( NULL, i18n( QString( "Can't read the hostname of your computer. But KShowmail need it to write a mail into the mailbox." ) ) );
+ KMessageBox::error( NULL, i18n( TQString( "Can't read the hostname of your computer. But KShowmail need it to write a mail into the mailbox." ) ) );
return false;
}
- QString partPID = QString::number( getpid() ); //middle part, the PID
+ TQString partPID = TQString::number( getpid() ); //middle part, the PID
- QString partCounter = QString::number( moveCounter++ );
+ TQString partCounter = TQString::number( moveCounter++ );
- QString uniqueName( partTime + "." + partPID + partCounter + "." + partHostname );
+ TQString uniqueName( partTime + "." + partPID + partCounter + "." + partHostname );
//build absolute path
mailDir.cd( "tmp" );
- QString absFile = mailDir.filePath( uniqueName );
+ TQString absFile = mailDir.filePath( uniqueName );
//and writing!
- QFile file( absFile );
+ TQFile file( absFile );
if( file.open( IO_WriteOnly ) )
{
- QTextStream stream( &file );
+ TQTextStream stream( &file );
stream << mail << endl;
file.close();
}
else
{
- KMessageBox::detailedError( NULL, i18n( QString( "Could not file a mail to %1." ) ).arg( box ), i18n( file.errorString() ) );
+ KMessageBox::detailedError( NULL, i18n( TQString( "Could not file a mail to %1." ) ).arg( box ), i18n( file.errorString() ) );
return false;
}
//now we move it to the "new" subdirectory
mailDir.cdUp();
mailDir.cd( "new" );
- QString absNewFile = mailDir.filePath( uniqueName );
+ TQString absNewFile = mailDir.filePath( uniqueName );
if( rename( absFile.ascii(), absNewFile.ascii() ) == -1 )
{
- KMessageBox::error( NULL, i18n( QString( "Could not move a mail from %1 to %2." ) ).arg( absFile ).arg( absNewFile ) );
+ KMessageBox::error( NULL, i18n( TQString( "Could not move a mail from %1 to %2." ) ).arg( absFile ).arg( absNewFile ) );
return false;
}
@@ -1449,10 +1449,10 @@ void ConfigElem::doDownloadActions()
getNextMailForDownloadActions();
}
-bool ConfigElem::isMailDir( const QDir & path )
+bool ConfigElem::isMailDir( const TQDir & path )
{
//get a list of all subdirectories in this directory
- const QStringList entries = path.entryList( QDir::Dirs | QDir::Readable | QDir::Writable | QDir::Hidden, QDir::Name | QDir::IgnoreCase | QDir::LocaleAware );
+ const TQStringList entries = path.entryList( TQDir::Dirs | TQDir::Readable | TQDir::Writable | TQDir::Hidden, TQDir::Name | TQDir::IgnoreCase | TQDir::LocaleAware );
//a maildir folder must contains the folders "cur", "new" and "tmp"
bool curFound = false;
@@ -1460,7 +1460,7 @@ bool ConfigElem::isMailDir( const QDir & path )
bool tmpFound = false;
//iterate over all directories and look for the three necessary dirs
- QStringList::const_iterator it = entries.begin();
+ TQStringList::const_iterator it = entries.begin();
while( it != entries.end() && !( curFound && newFound && tmpFound ) )
{
if( *it == "tmp" )
@@ -1489,13 +1489,13 @@ void ConfigElem::getNextMailForDownloadActions()
mailbody.resize( 0 );
//start job
- startKIOJob( QString( "/download/%1" ).arg( MailsToDownload.begin().key() ) );
- connect( pop3Job, SIGNAL( data( KIO::Job*, const QByteArray & ) ), SLOT( slotDataMailBody( KIO::Job*, const QByteArray & ) ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotMailDownloadedForAction( KIO::Job* ) ) );
+ startKIOJob( TQString( "/download/%1" ).arg( MailsToDownload.begin().key() ) );
+ connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotMailDownloadedForAction( TDEIO::Job* ) ) );
}
-void ConfigElem::slotMailDownloadedForAction(KIO::Job * job)
+void ConfigElem::slotMailDownloadedForAction(TDEIO::Job * job)
{
//stop timeout timer
pop3Timer->stop();
@@ -1503,7 +1503,7 @@ void ConfigElem::slotMailDownloadedForAction(KIO::Job * job)
//check for errors
//if an error has occured, the download will be canceled
//or will ask for a new password
- if( job->error() == KIO::ERR_COULD_NOT_LOGIN )
+ if( job->error() == TDEIO::ERR_COULD_NOT_LOGIN )
{
//login failed, ask for a new password
job->showErrorDialog();
@@ -1528,8 +1528,8 @@ void ConfigElem::slotMailDownloadedForAction(KIO::Job * job)
//do action
MailToDownloadMap_Type::Iterator firstMail = MailsToDownload.begin();
int currentMailNumber = firstMail.key(); //get mail number
- QString currentMailBox( firstMail.data().mailbox ); //get mailbox
- QString mail( mailbody ); //convert mailtext
+ TQString currentMailBox( firstMail.data().mailbox ); //get mailbox
+ TQString mail( mailbody ); //convert mailtext
FilterAction_Type action = firstMail.data().action; //get action
bool resultMove = false; //TRUE - mail is written into the mailbox
@@ -1644,7 +1644,7 @@ void ConfigElem::slotMailDownloadedForAction(KIO::Job * job)
getNextMailForDownloadActions();
}
-bool ConfigElem::isSpam( QByteArray mail ) const
+bool ConfigElem::isSpam( TQByteArray mail ) const
{
//check for a running spamassassin
if( !isSpamAssassinRunning() )
@@ -1701,7 +1701,7 @@ bool ConfigElem::isSpamAssassinRunning( ) const
while( chars_read > 0 )
{
buffer[ chars_read - 1 ] = '\0';
- QString output( buffer );
+ TQString output( buffer );
found = output.contains( NAME_SPAMASSASSIN_DAEMON ) > 0;
chars_read = fread( buffer, sizeof( char ), BUFSIZ, read_fp );
}
@@ -1736,7 +1736,7 @@ int ConfigElem::numberIgnoredMails( )
return nmbIgnoredMails;
}
-QStringList ConfigElem::getSelectedSenders( ) const
+TQStringList ConfigElem::getSelectedSenders( ) const
{
return m_pshowrecord->getSelectedSenders();
}
@@ -1747,12 +1747,12 @@ QStringList ConfigElem::getSelectedSenders( ) const
void ConfigElem::commitBeforeRefresh()
{
//start job to commit
- startKIOJob( QString( "/commit" ) );
- connect( pop3Job, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotCommitBeforeRefreshDone( KIO::Job* ) ) );
+ startKIOJob( TQString( "/commit" ) );
+ connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotCommitBeforeRefreshDone( TDEIO::Job* ) ) );
}
-void ConfigElem::slotCommitBeforeRefreshDone(KIO::Job *)
+void ConfigElem::slotCommitBeforeRefreshDone(TDEIO::Job *)
{
//after a commit was send, we start a new refresh cyle
refreshMailList();
diff --git a/kshowmail/configelem.h b/kshowmail/configelem.h
index 14f79ca..62cdca4 100644
--- a/kshowmail/configelem.h
+++ b/kshowmail/configelem.h
@@ -25,25 +25,25 @@
#include <stdio.h>
//QT headers
-#include <qstring.h>
-#include <qlistview.h>
-#include <qdom.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qregexp.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <ntqstring.h>
+#include <ntqlistview.h>
+#include <ntqdom.h>
+#include <ntqobject.h>
+#include <ntqtimer.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
//KDE headers
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kpassdlg.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdemessagebox.h>
+#include <tdeapplication.h>
//KShowmail headers
#include "showrecord.h"
@@ -54,7 +54,7 @@
#include "decodeRFC2047.h"
#include "kshowmailview.h"
#include "encryption.h"
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
#include "headerfilter.h"
#include "filterlog.h"
@@ -83,7 +83,7 @@ class ShowRecord;
* @author Eggert Ehmke <eggert.ehmke@berlin.de>
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigElem : public QObject {
+class ConfigElem : public TQObject {
Q_OBJECT
@@ -131,7 +131,7 @@ class ConfigElem : public QObject {
* @param config pointer to the general app configuration
* @param account name of the new account
*/
- ConfigElem( ConfigList* config, const QString& account );
+ ConfigElem( ConfigList* config, const TQString& account );
/**
* Destructor
@@ -155,26 +155,26 @@ class ConfigElem : public QObject {
* Gets the account name.
* @return account name
*/
- QString getAccountName() const;
+ TQString getAccountName() const;
/**
* Sets the account name.
* @param name the account name
*/
- void setAccountName( QString name );
+ void setAccountName( TQString name );
/**
* Gets the account password.
* @return password
*/
- QString getPassword() const;
+ TQString getPassword() const;
/**
* Sets the account password. To save it in the configuration file
* call saveOptions().
* @param password new password
*/
- void setPassword( const QString& password );
+ void setPassword( const TQString& password );
/**
* Returns whether a password is stored.
@@ -193,14 +193,14 @@ class ConfigElem : public QObject {
* @see m_pViewItem
* @param item account list view item
*/
- void setListViewItem( QListViewItem* item );
+ void setListViewItem( TQListViewItem* item );
/**
* Returns the pointer to the account list view item.
* @see m_pViewItem
* @return pointer to the appropriate list view item
*/
- QListViewItem* getListViewItem();
+ TQListViewItem* getListViewItem();
/**
* Returns TRUE, if the appropriate list view item is selected.
@@ -218,26 +218,26 @@ class ConfigElem : public QObject {
* Sets the host name.
* @param host host name
*/
- void setHost( const QString& host );
+ void setHost( const TQString& host );
/**
* Returns the hostname.
- * @return the name of the host or QString::null if no host is set
+ * @return the name of the host or TQString::null if no host is set
*/
- QString getHost() const;
+ TQString getHost() const;
/**
* Sets the protocol.
* @param protocol the protocol
*/
- void setProtocol( const QString& protocol );
+ void setProtocol( const TQString& protocol );
/**
* Returns the protocol.
* @param upperCase TRUE - transforms the protocol string to upper case
* @return protocol
*/
- QString getProtocol( bool upperCase = false ) const;
+ TQString getProtocol( bool upperCase = false ) const;
/**
* Enable or disable TLS.
@@ -268,13 +268,13 @@ class ConfigElem : public QObject {
* Sets the user.
* @param user username
*/
- void setUser( const QString& user );
+ void setUser( const TQString& user );
/**
* Returns the user name.
- * @return the user name or QString::null if there is no user name
+ * @return the user name or TQString::null if there is no user name
*/
- QString getUser() const;
+ TQString getUser() const;
/**
* Sets the password storage type.
@@ -298,13 +298,13 @@ class ConfigElem : public QObject {
* @param doc DOM document which contains all application settings, mails and account settings
* @param parent DOM element in which all settings and mails of this account will be saved
*/
- void saveOptions( QDomDocument& doc, QDomElement& parent );
+ void saveOptions( TQDomDocument& doc, TQDomElement& parent );
/**
* Gets the stored mails.
* @param parent DOM element which contains the mails of this account
*/
- void readStoredMails( QDomElement& parent );
+ void readStoredMails( TQDomElement& parent );
/**
* Returns the number of stored mails.
@@ -347,7 +347,7 @@ class ConfigElem : public QObject {
* Returns the subjects of the selected mails.
* @return subjects of selected mails
*/
- QStringList getSelectedSubjects() const;
+ TQStringList getSelectedSubjects() const;
/**
* Returns whether there are mails in the list that are selected
@@ -457,7 +457,7 @@ class ConfigElem : public QObject {
* Returns the senders of the selected mails
* @return senders of the selected mails
*/
- QStringList getSelectedSenders() const;
+ TQStringList getSelectedSenders() const;
private:
@@ -496,12 +496,12 @@ class ConfigElem : public QObject {
/**
* Account Name
*/
- QString m_strAccount;
+ TQString m_strAccount;
/**
* Pointer to the appropriate item in the account list view.
*/
- QListViewItem* m_pViewItem;
+ TQListViewItem* m_pViewItem;
/**
* List which contains all read mails from the server.
@@ -528,7 +528,7 @@ class ConfigElem : public QObject {
* Contains a downloaded mail body.
* Will be set by slotDataMailBody() and read by slotBodyDownloaded().
*/
- QByteArray mailbody;
+ TQByteArray mailbody;
/**
* Contains the numbers of mails which will be deleted.
@@ -569,13 +569,13 @@ class ConfigElem : public QObject {
/**
* Pointer to a launched pop3 job.
*/
- KIO::TransferJob* pop3Job;
+ TDEIO::TransferJob* pop3Job;
/**
* timeout timer. Will be started together with every pop3 job.
* If it runs down, slotTimeout() will be invoked.
*/
- QTimer* pop3Timer;
+ TQTimer* pop3Timer;
/**
* While refreshing, this ShowRecord instance will be used to
@@ -588,19 +588,19 @@ class ConfigElem : public QObject {
* List of received mail UIDs (unique ID).
* Used by slotReceiveUID() and slotUIDsReceived().
*/
- QStringList receivedUIDs;
+ TQStringList receivedUIDs;
/**
* List of received mail sizes.
* Used by slotReceiveSize() and slotSizesReceived().
*/
- QStringList receivedSizes;
+ TQStringList receivedSizes;
/**
* A received mail header.
* Set by slotReceiveHeader() and used by slotHeaderDownloaded().
*/
- QByteArray receivedHeader;
+ TQByteArray receivedHeader;
/**
* Every account has is own header filter instance.
@@ -710,7 +710,7 @@ class ConfigElem : public QObject {
* Creates a POP3 transfer job (KIO Job), which will be stored in pop3Job.
* @param path command and parameters of the job as URL path
*/
- void startKIOJob( const QString& path );
+ void startKIOJob( const TQString& path );
/**
* Returns the timeout time in seconds which is stored in the
@@ -855,7 +855,7 @@ class ConfigElem : public QObject {
* @param path the directory for test
* @return TRUE - directory is a maildir directory
*/
- bool isMailDir( const QDir& path );
+ bool isMailDir( const TQDir& path );
/**
* Writes the given mail into the mailbox.
@@ -863,7 +863,7 @@ class ConfigElem : public QObject {
* @param box path to the mailbox
* @return TRUE - Writing was succesful
*/
- bool writeToMailBox( const QString& mail, const QString& box );
+ bool writeToMailBox( const TQString& mail, const TQString& box );
private slots:
@@ -881,7 +881,7 @@ class ConfigElem : public QObject {
* @see pop3Job
* @see slotFinalizeDeletion()
*/
- void slotMailDeleted( KIO::Job* job );
+ void slotMailDeleted( TDEIO::Job* job );
/**
* Connected with the signal result of the job which commits the deletion.
@@ -891,7 +891,7 @@ class ConfigElem : public QObject {
* @see slotMailDeleted()
* @see sigDeleteReady
*/
- void slotFinalizeDeletion( KIO::Job* );
+ void slotFinalizeDeletion( TDEIO::Job* );
/**
* Connected with signal result of the launched pop3 job to
@@ -910,7 +910,7 @@ class ConfigElem : public QObject {
* @see slotFinalizeShowMail()
* @see ShowMailDialog
*/
- void slotBodyDownloaded( KIO::Job* job );
+ void slotBodyDownloaded( TDEIO::Job* job );
/**
* Connected with signal result of the launched pop3 job to
@@ -927,7 +927,7 @@ class ConfigElem : public QObject {
* @see getNextMailForDownloadActions()
* @see applyFilters()
*/
- void slotMailDownloadedForAction( KIO::Job* job );
+ void slotMailDownloadedForAction( TDEIO::Job* job );
/**
* Connected with signal data of the launched pop3 job to
@@ -937,7 +937,7 @@ class ConfigElem : public QObject {
* It extracts the body from the downloaded data and stores it in DownloadedMailBody.
* @param datas the downloaded mail
*/
- void slotDataMailBody( KIO::Job*, const QByteArray & datas );
+ void slotDataMailBody( TDEIO::Job*, const TQByteArray & datas );
/**
* Connected with the signal result of the job which commits the download
@@ -948,7 +948,7 @@ class ConfigElem : public QObject {
* @see slotBodyDownloaded()
* @see sigShowBodiesReady
*/
- void slotFinalizeShowMail( KIO::Job* );
+ void slotFinalizeShowMail( TDEIO::Job* );
/**
* Connected with signal timeout() of the timeout timer pop3Timer.
@@ -967,7 +967,7 @@ class ConfigElem : public QObject {
* The UIDs will be stored in receivedUIDs.
* @param data received data, which contain an uid
*/
- void slotReceiveUID( KIO::Job*, const QByteArray& data );
+ void slotReceiveUID( TDEIO::Job*, const TQByteArray& data );
/**
* Connected with signal result of the launched pop3 job to get the UIDs.
@@ -976,7 +976,7 @@ class ConfigElem : public QObject {
* in the new mail list accordingly.
* @param job job which has emitted the result signal
*/
- void slotUIDsReceived( KIO::Job* job );
+ void slotUIDsReceived( TDEIO::Job* job );
/**
* Connected with the signal "data" of the pop3 transfer job which gets mail
@@ -986,7 +986,7 @@ class ConfigElem : public QObject {
* The UIDs will be stored in receivedSizes.
* @param data received data, which contain a size
*/
- void slotReceiveSize( KIO::Job*, const QByteArray& data );
+ void slotReceiveSize( TDEIO::Job*, const TQByteArray& data );
/**
* Connected with signal result of the launched pop3 job to get the Sizes.
@@ -994,7 +994,7 @@ class ConfigElem : public QObject {
* Analyzes the received datas and writes these in the appropriate mail instances.
* @param job job which has emitted the result signal
*/
- void slotSizesReceived( KIO::Job* job );
+ void slotSizesReceived( TDEIO::Job* job );
/**
@@ -1002,7 +1002,7 @@ class ConfigElem : public QObject {
* Finalizes a succesful refresh.
* Emits sigRefreshReady and sets account state to idle
*/
- void slotFinalizeRefresh( KIO::Job* );
+ void slotFinalizeRefresh( TDEIO::Job* );
/**
* Connected with signal result of the launched pop3 job.
@@ -1019,7 +1019,7 @@ class ConfigElem : public QObject {
* @see cancelRefresh()
* @see copyHeaders()
*/
- void slotHeaderDownloaded( KIO::Job* job );
+ void slotHeaderDownloaded( TDEIO::Job* job );
/**
* Connected with the signal "data" of the pop3 transfer job which gets a mail
@@ -1029,7 +1029,7 @@ class ConfigElem : public QObject {
* The complete header will be stored in receivedHeader.
* @param data received data, which contains a header part
*/
- void slotReceiveHeader( KIO::Job*, const QByteArray& data );
+ void slotReceiveHeader( TDEIO::Job*, const TQByteArray& data );
/**
* Connected with the result signal of the pop3 job launched by commitBeforeRefresh()
@@ -1037,7 +1037,7 @@ class ConfigElem : public QObject {
* @see commitBeforeRefresh
* @see applyFiltersDeleted
*/
- void slotCommitBeforeRefreshDone( KIO::Job* );
+ void slotCommitBeforeRefreshDone( TDEIO::Job* );
signals:
@@ -1046,14 +1046,14 @@ class ConfigElem : public QObject {
* Will be emitted when all selected mails are deleted.
* @param account name of the account, which has emitted this signal
*/
- void sigDeleteReady( QString account );
+ void sigDeleteReady( TQString account );
/**
* Will be emitted when the bodies of all selected mails are
* downloaded and shown.
* @param account name of the account, which has emitted this signal
*/
- void sigShowBodiesReady( QString account );
+ void sigShowBodiesReady( TQString account );
/**
* Will be emitted when the settings have been changed.
@@ -1074,7 +1074,7 @@ class ConfigElem : public QObject {
* Will be emitted, when the mail list was refreshed.
* @param account name of the account, which has emitted this signal
*/
- void sigRefreshReady( QString account );
+ void sigRefreshReady( TQString account );
protected:
@@ -1083,7 +1083,7 @@ class ConfigElem : public QObject {
* @param mail the mail to test
* @return TRUE - mail is spam
*/
- bool isSpam( QByteArray mail ) const;
+ bool isSpam( TQByteArray mail ) const;
/**
* Looks for a running spamd daemon of SpamAssassin.
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index 0098550..c435d01 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -19,18 +19,18 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qfile.h>
+#include <ntqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <ksavefile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kaudioplayer.h>
#include <kdebug.h>
#include "configlist.h"
-ConfigList::ConfigList() : QObject()
+ConfigList::ConfigList() : TQObject()
{
setAutoDelete (true);
@@ -59,7 +59,7 @@ ConfigList::ConfigList() : QObject()
}
-int ConfigList::compareItems( QCollection::Item item1, QCollection::Item item2 )
+int ConfigList::compareItems( TQCollection::Item item1, TQCollection::Item item2 )
{
ConfigElem* p1 = (ConfigElem*)item1;
ConfigElem* p2 = (ConfigElem*)item2;
@@ -67,7 +67,7 @@ int ConfigList::compareItems( QCollection::Item item1, QCollection::Item item2 )
return strcmp( p1->getAccountName(), p2->getAccountName() );
}
-QCollection::Item ConfigList::newItem( QCollection::Item item )
+TQCollection::Item ConfigList::newItem( TQCollection::Item item )
{
return new ConfigElem( (ConfigElem*)item );
}
@@ -77,17 +77,17 @@ void ConfigList::saveOptions ()
kdDebug () << "ConfigList::saveOptions" << endl;
//create XML document
- QDomDocument doc( "KShowmail" );
+ TQDomDocument doc( "KShowmail" );
//create root element
- QDomElement accounts = doc.createElement( ROOT_ELEMENT );
+ TQDomElement accounts = doc.createElement( ROOT_ELEMENT );
//create for every account an element
//the account saves its mails into this element
//after that the element will be appended to the root element
int i = 0;
ConfigElem* account = NULL; //current processed account
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
//iterate over all accounts
while( ( account = it.current() ) != NULL )
@@ -96,7 +96,7 @@ void ConfigList::saveOptions ()
++it;
//save mails
- QDomElement accElem = doc.createElement( QString( ACCOUNT_ELEMENT ) + QString( "%1" ).arg( i++ ) );
+ TQDomElement accElem = doc.createElement( TQString( ACCOUNT_ELEMENT ) + TQString( "%1" ).arg( i++ ) );
account->saveOptions( doc, accElem ); //account saves the mails into given XML document and the setup into the application config file
accounts.appendChild( accElem );
@@ -106,8 +106,8 @@ void ConfigList::saveOptions ()
doc.appendChild( accounts );
//save XML document
- QCString str = doc.toCString(); //convert XML document to a string
- QString cachefilename = locateLocal( "config", MAIL_FILE ); //get file path
+ TQCString str = doc.toCString(); //convert XML document to a string
+ TQString cachefilename = locateLocal( "config", MAIL_FILE ); //get file path
KSaveFile file( cachefilename, 0600 ); //create file
if( file.status() != 0 )
@@ -128,15 +128,15 @@ void ConfigList::saveOptions ()
}
-void ConfigList::setList (QListView* list)
+void ConfigList::setList (TQListView* list)
{
- QPixmap pix (::locate ("data", "kshowmail/pics/ok.png"));
+ TQPixmap pix (::locate ("data", "kshowmail/pics/ok.png"));
list->clear ();
int nIndex = at ();
- QListViewItem* last = NULL;
+ TQListViewItem* last = NULL;
for (ConfigElem* pElem = first(); pElem; pElem = next())
{
- last = new QListViewItem (list, last, "", pElem->getAccountName(), pElem->getURL().host(), pElem->getURL().user(), "?");
+ last = new TQListViewItem (list, last, "", pElem->getAccountName(), pElem->getURL().host(), pElem->getURL().user(), "?");
pElem->setListViewItem( last );
if (pElem->isActive())
pElem->getListViewItem()->setPixmap (0, pix);
@@ -278,7 +278,7 @@ ConfigElem* ConfigList::getSelectedAccount( )
void ConfigList::deleteSelectedMails( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//clear the map, which contains the names of the accounts,
@@ -317,7 +317,7 @@ void ConfigList::slotAccountConfigChanged( )
emit sigConfigChanged();
}
-void ConfigList::slotCheckDeletionState( QString account )
+void ConfigList::slotCheckDeletionState( TQString account )
{
bool accountDeleting = false; //set to TRUE if an account is still deleting
AccountTaskMap_Type::Iterator it; //iterator over the account deletion map
@@ -340,7 +340,7 @@ void ConfigList::slotCheckDeletionState( QString account )
void ConfigList::connectAccounts( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to connect
while( ( account = it.current() ) != NULL )
@@ -350,11 +350,11 @@ void ConfigList::connectAccounts( )
//connect
connect( account, SIGNAL( sigConfigChanged() ), this, SLOT( slotAccountConfigChanged() ) );
- connect( account, SIGNAL( sigDeleteReady( QString ) ), this, SLOT( slotCheckDeletionState( QString ) ) );
- connect( account, SIGNAL( sigShowBodiesReady( QString ) ), this, SLOT( slotCheckShowBodiesState( QString ) ) );
+ connect( account, SIGNAL( sigDeleteReady( TQString ) ), this, SLOT( slotCheckDeletionState( TQString ) ) );
+ connect( account, SIGNAL( sigShowBodiesReady( TQString ) ), this, SLOT( slotCheckShowBodiesState( TQString ) ) );
connect( account, SIGNAL( sigMessageWindowOpened() ), this, SLOT( slotMessageWindowOpened() ) );
connect( account, SIGNAL( sigMessageWindowClosed() ), this, SLOT( slotMessageWindowClosed() ) );
- connect( account, SIGNAL( sigRefreshReady( QString ) ), this, SLOT( slotCheckRefreshState( QString ) ) );
+ connect( account, SIGNAL( sigRefreshReady( TQString ) ), this, SLOT( slotCheckRefreshState( TQString ) ) );
//get next account
++it;
@@ -371,10 +371,10 @@ bool ConfigList::confirmDeletion( )
return m_bConfirmDelete;
}
-QStringList ConfigList::getSelectedSubjects( ) const
+TQStringList ConfigList::getSelectedSubjects( ) const
{
- QStringList subjects; //contains all subjects
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQStringList subjects; //contains all subjects
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //current account
while( ( account = it.current() ) != NULL )
@@ -392,7 +392,7 @@ QStringList ConfigList::getSelectedSubjects( ) const
bool ConfigList::hasSelectedMails( )
{
bool foundSelected = false; //set to TRUE, when an account with selected mails was found
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //current account
while( ( account = it.current() ) != NULL && !foundSelected )
@@ -409,7 +409,7 @@ bool ConfigList::hasSelectedMails( )
void ConfigList::showSelectedMails( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//clear the map, which contains the names of the accounts,
@@ -444,7 +444,7 @@ void ConfigList::showSelectedMails( )
}
-void ConfigList::slotCheckShowBodiesState( QString account )
+void ConfigList::slotCheckShowBodiesState( TQString account )
{
bool accountDownloading = false; //set to TRUE if an account is downloading mail body yet
AccountTaskMap_Type::Iterator it; //iterator over the account map
@@ -506,7 +506,7 @@ void ConfigList::slotMessageWindowClosed( )
void ConfigList::refreshMailLists( FilterLog* log )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//return, if no accounts available
@@ -548,7 +548,7 @@ void ConfigList::refreshMailLists( FilterLog* log )
}
-void ConfigList::slotCheckRefreshState( QString account )
+void ConfigList::slotCheckRefreshState( TQString account )
{
bool accountRefreshing = false; //set to TRUE if an account is still refreshing
AccountTaskMap_Type::Iterator it; //iterator over the account map
@@ -574,7 +574,7 @@ void ConfigList::slotCheckRefreshState( QString account )
int ConfigList::getNumberNewMails( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
int number = 0; //number of new mails
@@ -593,7 +593,7 @@ int ConfigList::getNumberNewMails( )
int ConfigList::getNumberMails( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
int number = 0; //number of mails
@@ -612,7 +612,7 @@ int ConfigList::getNumberMails( )
long ConfigList::getTotalSize( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
long size = 0; //total size of all mails
@@ -631,7 +631,7 @@ long ConfigList::getTotalSize( )
void ConfigList::fillMailListView( KshowmailView * view )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//iterate over all accounts and order the active accounts to fill their mails
@@ -687,7 +687,7 @@ bool ConfigList::hasInitTime( )
void ConfigList::refreshAccountList( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//iterate over all accounts and order the account to refresh its
@@ -704,7 +704,7 @@ void ConfigList::refreshAccountList( )
void ConfigList::killPOP3Jobs( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
//iterate over all accounts and order the account to kill
@@ -720,7 +720,7 @@ void ConfigList::killPOP3Jobs( )
void ConfigList::showSelectedHeaders( )
{
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //account to process
int showNextHeader = ConfigElem::continueShowHeaders; //return value of ConfigElem::showSelectedHeaders
@@ -736,10 +736,10 @@ void ConfigList::showSelectedHeaders( )
}
}
-void ConfigList::refreshSetup( KListView* view )
+void ConfigList::refreshSetup( TDEListView* view )
{
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//read actions group
config->setGroup( CONFIG_GROUP_ACTIONS );
@@ -802,12 +802,12 @@ void ConfigList::refreshSetup( KListView* view )
//get account names from the config file
config->setGroup( CONFIG_GROUP_ACCOUNTS );
- QStringList accounts = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, QStringList() );
+ TQStringList accounts = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, TQStringList() );
//remove deleted accounts from the account list
//accounts are deleted, if the are in ConfigList yet, but not in the list of the config file (accounts)
ConfigElem* accountDel = NULL; //current processed account
- QPtrListIterator<ConfigElem> iter( *this ); //iterator for the account list (ConfigList)
+ TQPtrListIterator<ConfigElem> iter( *this ); //iterator for the account list (ConfigList)
//iterate over all accounts (ConfigList)
while( ( accountDel = iter.current() ) != NULL )
@@ -816,7 +816,7 @@ void ConfigList::refreshSetup( KListView* view )
++iter;
//search for the current account in the account list of the config file
- QStringList::Iterator foundAccount = accounts.find( accountDel->getAccountName() );
+ TQStringList::Iterator foundAccount = accounts.find( accountDel->getAccountName() );
//remove account from ConfigList, if it is not in the list of the config file
if( foundAccount == accounts.end() )
@@ -826,7 +826,7 @@ void ConfigList::refreshSetup( KListView* view )
//add or edit accounts
ConfigElem* acc;
//iterate over all items of the account list of the config file
- for( QStringList::Iterator it = accounts.begin(); it != accounts.end(); ++it )
+ for( TQStringList::Iterator it = accounts.begin(); it != accounts.end(); ++it )
{
//create a new account, if it is not in the list yet (ConfigList)
//or get the account
@@ -851,7 +851,7 @@ void ConfigList::refreshSetup( KListView* view )
//set protocol and security
//if the read protocol is POP3 and SSL is enabled, the account protocol will set to "pop3s"
- QString proto = config->readEntry( CONFIG_ENTRY_ACCOUNT_PROTOCOL, DEFAULT_ACCOUNT_PROTOCOL ).lower();
+ TQString proto = config->readEntry( CONFIG_ENTRY_ACCOUNT_PROTOCOL, DEFAULT_ACCOUNT_PROTOCOL ).lower();
int secureTransfer = config->readNumEntry( CONFIG_ENTRY_ACCOUNT_SECTRANSFER, DEFAULT_ACCOUNT_SECTRANSFER );
if( proto == "pop3" && secureTransfer == CONFIG_VALUE_ACCOUNT_SECTRANSFER_SSL )
@@ -878,7 +878,7 @@ void ConfigList::refreshSetup( KListView* view )
{
case CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE:
acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
- acc->setPassword( QString::null );
+ acc->setPassword( TQString::null );
break;
case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE:
@@ -893,7 +893,7 @@ void ConfigList::refreshSetup( KListView* view )
default:
acc->setPasswordStorage( DEFAULT_ACCOUNT_PASSWORD_STORAGE );
- acc->setPassword( QString::null );
+ acc->setPassword( TQString::null );
}
//order the account to reloads its filter setup
@@ -911,7 +911,7 @@ void ConfigList::executeNewMailCommand( )
{
if( m_bCommand )
{
- if( m_strCommandPath != QString::null && m_strCommandPath != "" )
+ if( m_strCommandPath != TQString::null && m_strCommandPath != "" )
{
KShellProcess proc; //process handler to execute the binary
@@ -952,11 +952,11 @@ bool ConfigList::showConnectionErrors( ) const
return m_bShowConnectionErrors;
}
-bool ConfigList::hasAccount( const QString & name ) const
+bool ConfigList::hasAccount( const TQString & name ) const
{
bool found = false; //TRUE if we have found the given account
ConfigElem* account; //account from which we want to get its name
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
//iterate over all accounts
while( ( account = it.current() ) != NULL && !found )
@@ -972,11 +972,11 @@ bool ConfigList::hasAccount( const QString & name ) const
return found;
}
-ConfigElem * ConfigList::getAccount( const QString & name ) const
+ConfigElem * ConfigList::getAccount( const TQString & name ) const
{
bool found = false; //TRUE if we have found the given account
ConfigElem* account = NULL; //account from which we want to get its name
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
ConfigElem* returnValue = NULL;
//iterate over all accounts
@@ -999,7 +999,7 @@ ConfigElem * ConfigList::getAccount( const QString & name ) const
void ConfigList::printSetup( )
{
ConfigElem* account = NULL; //account from which we want to print the setup
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
//iterate over all accounts
while( ( account = it.current() ) != NULL )
@@ -1015,8 +1015,8 @@ void ConfigList::printSetup( )
void ConfigList::readStoredMails( )
{
//open file
- QString MailFileName = locateLocal( "config", MAIL_FILE );
- QFile file( MailFileName );
+ TQString MailFileName = locateLocal( "config", MAIL_FILE );
+ TQFile file( MailFileName );
bool fileOpen = file.open( IO_ReadOnly );
//return, if the file could not be opened
@@ -1027,8 +1027,8 @@ void ConfigList::readStoredMails( )
}
//create DOM document with the content read from the file
- QDomDocument doc( MAIL_FILE_DOCTYPE );
- QString* errorMsg = new QString();
+ TQDomDocument doc( MAIL_FILE_DOCTYPE );
+ TQString* errorMsg = new TQString();
bool success = doc.setContent( &file );
if( !success )
@@ -1037,19 +1037,19 @@ void ConfigList::readStoredMails( )
}
//get the root element
- QDomElement accounts = doc.namedItem ( ROOT_ELEMENT ).toElement();
+ TQDomElement accounts = doc.namedItem ( ROOT_ELEMENT ).toElement();
//get the first account element
- QDomNode accNode = accounts.firstChild();
+ TQDomNode accNode = accounts.firstChild();
//get all account elements
while( !accNode.isNull() )
{
//convert account node to DOM element
- QDomElement accElem = accNode.toElement();
+ TQDomElement accElem = accNode.toElement();
//get the account name
- QString accName = accElem.attribute( ATTRIBUTE_ACCOUNT_NAME );
+ TQString accName = accElem.attribute( ATTRIBUTE_ACCOUNT_NAME );
//get the proper account object
ConfigElem* account = getAccount( accName );
@@ -1070,7 +1070,7 @@ FilterAction_Type ConfigList::getSpamAction( )
return spamAction;
}
-QString ConfigList::getSpamMailbox( )
+TQString ConfigList::getSpamMailbox( )
{
return spamMailbox;
}
@@ -1078,7 +1078,7 @@ QString ConfigList::getSpamMailbox( )
int ConfigList::numberDeletedMailsLastRefresh( )
{
ConfigElem* account = NULL;
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
int number = 0;
//iterate over all accounts
@@ -1096,7 +1096,7 @@ int ConfigList::numberDeletedMailsLastRefresh( )
int ConfigList::numberDeletedMailsStart( )
{
ConfigElem* account = NULL;
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
int number = 0;
//iterate over all accounts
@@ -1114,7 +1114,7 @@ int ConfigList::numberDeletedMailsStart( )
int ConfigList::numberMovedMailsLastRefresh( )
{
ConfigElem* account = NULL;
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
int number = 0;
//iterate over all accounts
@@ -1132,7 +1132,7 @@ int ConfigList::numberMovedMailsLastRefresh( )
int ConfigList::numberMovedMailsStart( )
{
ConfigElem* account = NULL;
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
int number = 0;
//iterate over all accounts
@@ -1150,7 +1150,7 @@ int ConfigList::numberMovedMailsStart( )
int ConfigList::numberIgnoredMails( )
{
ConfigElem* account = NULL;
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
int number = 0;
//iterate over all accounts
@@ -1165,10 +1165,10 @@ int ConfigList::numberIgnoredMails( )
return number;
}
-QStringList ConfigList::getSelectedSenders( ) const
+TQStringList ConfigList::getSelectedSenders( ) const
{
- QStringList senders; //contains all senders
- QPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
+ TQStringList senders; //contains all senders
+ TQPtrListIterator<ConfigElem> it( *this ); //to iterate over all accounts
ConfigElem* account; //current account
while( ( account = it.current() ) != NULL )
@@ -1186,7 +1186,7 @@ QStringList ConfigList::getSelectedSenders( ) const
void ConfigList::refreshFilterSetup( )
{
ConfigElem* account; //account
- QPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
+ TQPtrListIterator<ConfigElem> it( *this ); //iterator for the account list
//iterate over all accounts
while( ( account = it.current() ) != NULL )
diff --git a/kshowmail/configlist.h b/kshowmail/configlist.h
index 97418cd..158c665 100644
--- a/kshowmail/configlist.h
+++ b/kshowmail/configlist.h
@@ -22,10 +22,10 @@
#ifndef CONFIGLIST_H
#define CONFIGLIST_H
-//Qt header
-#include <qptrlist.h>
-#include <qlistview.h>
-#include <qobject.h>
+//TQt header
+#include <ntqptrlist.h>
+#include <ntqlistview.h>
+#include <ntqobject.h>
//KDE headers
#include <kcombobox.h>
@@ -38,7 +38,7 @@
#include "kshowmailview.h"
#include "types.h"
#include "encryption.h"
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
#include "filteritem.h"
#include "headerfilter.h"
#include "filterlog.h"
@@ -56,7 +56,7 @@ class KshowmailView;
* @author Eggert Ehmke
* @author Ulrich Weigelt
*/
-class ConfigList : public QObject, public QPtrList<ConfigElem>
+class ConfigList : public TQObject, public TQPtrList<ConfigElem>
{
Q_OBJECT
@@ -78,7 +78,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* sets the properties.
* @param view pointer to the account list view
*/
- void refreshSetup( KListView* view );
+ void refreshSetup( TDEListView* view );
/**
* Reloads the filter settings
@@ -217,7 +217,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* Returns the subjects of the selected mails.
* @return subjects of selected mails
*/
- QStringList getSelectedSubjects() const;
+ TQStringList getSelectedSubjects() const;
/**
* Returns whether there are mails in this list which are selected
@@ -377,7 +377,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* Returns the mailbox for spam mails
* @return mailbox for spam
*/
- QString getSpamMailbox();
+ TQString getSpamMailbox();
/**
* Returns the number of deleted mails by last refresh.
@@ -413,10 +413,10 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* Returns the senders of the selected mails
* @return senders of the selected mails
*/
- QStringList getSelectedSenders() const;
+ TQStringList getSelectedSenders() const;
bool setItem (const char* item);
- void setList (QListView* list);
+ void setList (TQListView* list);
void beep ();
void playSound ();
void playSound (const char* file);
@@ -427,7 +427,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Time in minutes to the next automatic refresh.
@@ -530,7 +530,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
/**
* Sound file which will be played if a new mail is arrived.
*/
- QString m_strSoundFile;
+ TQString m_strSoundFile;
/**
* TRUE - If a new mail is arrived a command will be executed.
@@ -540,7 +540,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
/**
* Path to command which will be executed if a new mail is arrived.
*/
- QString m_strCommandPath;
+ TQString m_strCommandPath;
/**
* TRUE - If no new mail is arrived the application will be ended.
@@ -585,7 +585,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
/**
* Mailbox for Spam, if configured
*/
- QString spamMailbox;
+ TQString spamMailbox;
/**
* Action which shall be done, if the mail is Spam
@@ -597,22 +597,22 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
/**
* Makes a copy from the given account object and returns the pointer to it.
- * Reimplementation of QPtrList::newItem().
- * Used by QPtrList to add new items.
+ * Reimplementation of TQPtrList::newItem().
+ * Used by TQPtrList to add new items.
* @param item account object
* @return pointer to the new account object
*/
- virtual QCollection::Item newItem( QCollection::Item item );
+ virtual TQCollection::Item newItem( TQCollection::Item item );
/**
* Compares two ConfigElem objects.
- * Reimplementation of QPtrList::compareItems(). Used by inSort().
+ * Reimplementation of TQPtrList::compareItems(). Used by inSort().
* @param item1 account 1
* @param item2 account 2
* @return 0 if account name 1 == account name 2
* @return nonzero if account name 2 != account name 2
*/
- virtual int compareItems( QCollection::Item item1, QCollection::Item item2 );
+ virtual int compareItems( TQCollection::Item item1, TQCollection::Item item2 );
/**
* Returns whether the given account is in the list
@@ -620,14 +620,14 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* @return TRUE - account is existent
* @return FALSE - account is not existent
*/
- bool hasAccount( const QString& name ) const;
+ bool hasAccount( const TQString& name ) const;
/**
* Returns the pointer to the account named like the given name.
* @param name of the searched account
* @return account or NULL, if the account was not found
*/
- ConfigElem* getAccount( const QString& name ) const;
+ ConfigElem* getAccount( const TQString& name ) const;
protected slots:
@@ -646,7 +646,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* @param account name of the account which has emitted the signal
* @see AccountDeletionMap
*/
- void slotCheckDeletionState( QString account );
+ void slotCheckDeletionState( TQString account );
/**
* Connected with signal sigShowBodiesReady of all accounts.
@@ -657,7 +657,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* @param account name of the account which has emitted the signal
* @see AccountShowBodiesMap
*/
- void slotCheckShowBodiesState( QString account );
+ void slotCheckShowBodiesState( TQString account );
/**
* Connected with signal sigMessageWindowOpened of all accounts.
@@ -690,7 +690,7 @@ class ConfigList : public QObject, public QPtrList<ConfigElem>
* @param account name of the account which has emitted the signal
* @see AccountRefreshMap
*/
- void slotCheckRefreshState( QString account );
+ void slotCheckRefreshState( TQString account );
signals:
diff --git a/kshowmail/decodeRFC2047.cpp b/kshowmail/decodeRFC2047.cpp
index adf53de..dfaf556 100644
--- a/kshowmail/decodeRFC2047.cpp
+++ b/kshowmail/decodeRFC2047.cpp
@@ -22,9 +22,9 @@
* These functions have been adapted from the KMail program
*/
-QCString decodeQuotedPrintable(const QCString& aStr)
+TQCString decodeQuotedPrintable(const TQCString& aStr)
{
- QCString bStr = aStr;
+ TQCString bStr = aStr;
if (aStr.isNull())
bStr = "";
@@ -35,44 +35,44 @@ QCString decodeQuotedPrintable(const QCString& aStr)
return dwdest.c_str();
}
-QCString decodeBase64(const QCString& aStr)
+TQCString decodeBase64(const TQCString& aStr)
{
- QCString bStr = aStr;
+ TQCString bStr = aStr;
if (aStr.isNull())
bStr = "";
while (bStr.length() < 16) bStr += "=";
DwString dwsrc(bStr.data(), bStr.length());
DwString dwdest;
- QCString result;
+ TQCString result;
DwDecodeBase64(dwsrc, dwdest);
result = dwdest.c_str();
return result;
}
-QTextCodec* codecForName(const QCString& _str)
+TQTextCodec* codecForName(const TQCString& _str)
{
if (_str.isEmpty()) return NULL;
if (_str.lower() == "shift_jis" || _str.lower() == "shift-jis")
- return QTextCodec::codecForName("sjis");
- return QTextCodec::codecForName(_str.lower().replace(
- QRegExp("windows"), "cp") );
+ return TQTextCodec::codecForName("sjis");
+ return TQTextCodec::codecForName(_str.lower().replace(
+ TQRegExp("windows"), "cp") );
}
-QString Codecs::decodeRFC2047(const QCString& aStr)
+TQString Codecs::decodeRFC2047(const TQCString& aStr)
{
- QString result;
- QCString charset;
+ TQString result;
+ TQCString charset;
char *pos, *beg, *end, *mid;
- QCString str, cstr, LWSP_buffer;
+ TQCString str, cstr, LWSP_buffer;
char encoding, ch;
bool valid, lastWasEncodedWord=FALSE;
const int maxLen=200;
int i;
if (aStr.find("=?") < 0)
- return QString::fromLocal8Bit(aStr).replace(QRegExp("\n[\t ]")," ");
+ return TQString::fromLocal8Bit(aStr).replace(TQRegExp("\n[\t ]")," ");
for (pos=aStr.data(); *pos; pos++)
{
@@ -138,7 +138,7 @@ QString Codecs::decodeRFC2047(const QCString& aStr)
// valid encoding: decode and throw away separating LWSP
ch = *pos;
*pos = '\0';
- str = QCString(mid).left((int)(mid - pos - 1));
+ str = TQCString(mid).left((int)(mid - pos - 1));
if (encoding == 'Q')
{
// decode quoted printable text
@@ -152,13 +152,13 @@ QString Codecs::decodeRFC2047(const QCString& aStr)
// decode base64 text
cstr = decodeBase64(str);
}
- QTextCodec *codec = codecForName(charset);
+ TQTextCodec *codec = codecForName(charset);
if (!codec)
- codec = codecForName(KGlobal::locale()->encoding());
+ codec = codecForName(TDEGlobal::locale()->encoding());
if (codec)
result += codec->toUnicode(cstr);
else
- result += QString::fromLocal8Bit(cstr);
+ result += TQString::fromLocal8Bit(cstr);
lastWasEncodedWord = TRUE;
*pos = ch;
diff --git a/kshowmail/decodeRFC2047.h b/kshowmail/decodeRFC2047.h
index d4822a9..fad7810 100644
--- a/kshowmail/decodeRFC2047.h
+++ b/kshowmail/decodeRFC2047.h
@@ -20,15 +20,15 @@
#include <ctype.h>
#include <stdlib.h>
-//Qt header
-#include <qtextcodec.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qcstring.h>
+//TQt header
+#include <ntqtextcodec.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqcstring.h>
//KDE header
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <mimelib/mimepp.h>
@@ -44,7 +44,7 @@ namespace Codecs
* @param aStr the coded string
* @return the decoded representation of the given string
*/
- QString decodeRFC2047( const QCString& aStr );
+ TQString decodeRFC2047( const TQCString& aStr );
}
diff --git a/kshowmail/encryption.cpp b/kshowmail/encryption.cpp
index dd3bcec..0bc1efe 100644
--- a/kshowmail/encryption.cpp
+++ b/kshowmail/encryption.cpp
@@ -23,11 +23,11 @@ int Encryption::hexbyt( const char c )
return c - 'A' + 10;
}
-const QString Encryption::crypt( const KURL& url )
+const TQString Encryption::crypt( const KURL& url )
{
char result[50];
char scramble2[50];
- QString hexresult;
+ TQString hexresult;
memset (result, 0, 50);
memset (scramble2, 0, 50);
@@ -69,7 +69,7 @@ const QString Encryption::crypt( const KURL& url )
return hexresult;
}
-const QString Encryption::decrypt( const QString& pass )
+const TQString Encryption::decrypt( const TQString& pass )
{
char result[50];
diff --git a/kshowmail/encryption.h b/kshowmail/encryption.h
index 376cc26..4c68b4f 100644
--- a/kshowmail/encryption.h
+++ b/kshowmail/encryption.h
@@ -10,8 +10,8 @@
//
//
-//Qt headers
-#include <qstring.h>
+//TQt headers
+#include <ntqstring.h>
//KDE headers
#include <kurl.h>
@@ -35,12 +35,12 @@ namespace Encryption
* @param url the url with password, host and user name
* @return encrypted password
*/
- const QString crypt( const KURL& url );
+ const TQString crypt( const KURL& url );
/**
* Decrypts the given encrypted password.
* @param pass encrypted password
* @return decrypted password
*/
- const QString decrypt( const QString& pass );
+ const TQString decrypt( const TQString& pass );
}
diff --git a/kshowmail/filteritem.cpp b/kshowmail/filteritem.cpp
index 97c284b..70a2954 100644
--- a/kshowmail/filteritem.cpp
+++ b/kshowmail/filteritem.cpp
@@ -14,13 +14,13 @@
FilterItem::FilterItem( uint filterNr )
{
//get the application config object
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//save number
filterNumber = filterNr;
//set config group
- config->setGroup( QString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( filterNr ) );
+ config->setGroup( TQString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( filterNr ) );
//get name
name = config->readEntry( CONFIG_ENTRY_FILTER_NAME );
@@ -59,7 +59,7 @@ FilterItem::FilterItem( uint filterNr )
if( mailbox.isNull() || mailbox.isEmpty() )
{
kdWarning() << "Filter " << filterNumber << ": No mailbox name found. Set default: " << DEFAULT_FILTER_ACTION_MOVE_MAILBOX << endl;
- mailbox = QString( DEFAULT_FILTER_ACTION_MOVE_MAILBOX );
+ mailbox = TQString( DEFAULT_FILTER_ACTION_MOVE_MAILBOX );
}
}
@@ -76,7 +76,7 @@ FilterItem::~FilterItem()
{
}
-FilterAction_Type FilterItem::check( QString from, QString to, uint size, QString subject, QString header, QString account, QString& mailboxName ) const
+FilterAction_Type FilterItem::check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account, TQString& mailboxName ) const
{
bool match = false; //TRUE, if filter matches
@@ -84,7 +84,7 @@ FilterAction_Type FilterItem::check( QString from, QString to, uint size, QStrin
if( criterias.isEmpty() ) return FActNone;
//get iterator
- QPtrListIterator<FilterItemCriteria> it( criterias );
+ TQPtrListIterator<FilterItemCriteria> it( criterias );
FilterItemCriteria* crit;
@@ -154,7 +154,7 @@ void FilterItem::print( ) const
}
kdDebug() << "Criterias:" << endl;
- QPtrListIterator<FilterItemCriteria> it( criterias );
+ TQPtrListIterator<FilterItemCriteria> it( criterias );
FilterItemCriteria* crit;
while( ( crit = it.current() ) != NULL )
{
diff --git a/kshowmail/filteritem.h b/kshowmail/filteritem.h
index 291bc65..28aac13 100644
--- a/kshowmail/filteritem.h
+++ b/kshowmail/filteritem.h
@@ -12,14 +12,14 @@
#ifndef FILTERITEM_H
#define FILTERITEM_H
-//Qt headers
-#include <qstring.h>
-#include <qptrlist.h>
+//TQt headers
+#include <ntqstring.h>
+#include <ntqptrlist.h>
//KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
//KShowmail headers
#include "filteritemcriteria.h"
@@ -64,14 +64,14 @@ class FilterItem{
* @param mailboxName contains the mailbox name after call, if filter action is MOVE
* @return recommend action
*/
- FilterAction_Type check( QString from, QString to, uint size, QString subject, QString header, QString account, QString& mailboxName ) const;
+ FilterAction_Type check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account, TQString& mailboxName ) const;
private:
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Filter number. Just for messages.
@@ -81,7 +81,7 @@ class FilterItem{
/**
* Filter name. Just for messages.
*/
- QString name;
+ TQString name;
/**
* Number of criterias
@@ -106,12 +106,12 @@ class FilterItem{
/**
* Mailbox Name for move action
*/
- QString mailbox;
+ TQString mailbox;
/**
* This list holds the criterias.
*/
- QPtrList<FilterItemCriteria> criterias;
+ TQPtrList<FilterItemCriteria> criterias;
};
#endif
diff --git a/kshowmail/filteritemcriteria.cpp b/kshowmail/filteritemcriteria.cpp
index 5577a6a..6d8684d 100644
--- a/kshowmail/filteritemcriteria.cpp
+++ b/kshowmail/filteritemcriteria.cpp
@@ -14,7 +14,7 @@
FilterItemCriteria::FilterItemCriteria( uint FilterNr, uint CritNr )
{
//get the application config object
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//save numbers
FilterNumber = FilterNr;
@@ -24,10 +24,10 @@ FilterItemCriteria::FilterItemCriteria( uint FilterNr, uint CritNr )
//---------
//set group
- config->setGroup( QString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( FilterNr ) );
+ config->setGroup( TQString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( FilterNr ) );
//get source
- switch( config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_SOURCE ) )
+ switch( config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_SOURCE ) )
{
case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_FROM : source = SrcFrom; break;
case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_TO : source = SrcTo; break;
@@ -41,7 +41,7 @@ FilterItemCriteria::FilterItemCriteria( uint FilterNr, uint CritNr )
//get condition
if( source == SrcSize )
{
- switch( config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_COND_NUM ) )
+ switch( config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_COND_NUM ) )
{
case CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_EQUAL : numCondition = NumCondEqual; break;
case CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_NOT_EQUAL : numCondition = NumCondNotEqual; break;
@@ -54,7 +54,7 @@ FilterItemCriteria::FilterItemCriteria( uint FilterNr, uint CritNr )
}
else
{
- switch( config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_COND_TEXT ) )
+ switch( config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_COND_TEXT ) )
{
case CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_CONTAINS : txtCondition = TxtCondContains; break;
case CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_NOT_CONTAINS : txtCondition = TxtCondNotContains; break;
@@ -65,17 +65,17 @@ FilterItemCriteria::FilterItemCriteria( uint FilterNr, uint CritNr )
default : txtCondition = TxtCondContains; break;
}
- cs = config->readBoolEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_CASE_SENSITIVE );
+ cs = config->readBoolEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( CritNr ), DEFAULT_FILTER_CRITERIA_CASE_SENSITIVE );
}
//get Value
if( source == SrcSize )
{
- numValue = config->readUnsignedNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( CritNr ) );
+ numValue = config->readUnsignedNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( CritNr ) );
}
else
{
- txtValue = config->readEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( CritNr ) );
+ txtValue = config->readEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( CritNr ) );
}
}
@@ -84,7 +84,7 @@ FilterItemCriteria::~FilterItemCriteria()
{
}
-bool FilterItemCriteria::check( QString from, QString to, uint size, QString subject, QString header, QString account ) const
+bool FilterItemCriteria::check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account ) const
{
switch( source )
{
@@ -101,7 +101,7 @@ bool FilterItemCriteria::check( QString from, QString to, uint size, QString sub
return false;
}
-bool FilterItemCriteria::checkText( QString value ) const
+bool FilterItemCriteria::checkText( TQString value ) const
{
//return false if the source is not text
if( source != SrcFrom && source != SrcTo && source != SrcHeader && source != SrcSubject && source != SrcAccount )
@@ -135,7 +135,7 @@ bool FilterItemCriteria::checkText( QString value ) const
}
else
{
- return QString::localeAwareCompare( txtValue.upper(), value.upper() ) == 0;
+ return TQString::localeAwareCompare( txtValue.upper(), value.upper() ) == 0;
}
break;
@@ -145,9 +145,9 @@ bool FilterItemCriteria::checkText( QString value ) const
return value.localeAwareCompare( txtValue.upper(), value.upper() ) != 0;
break;
- case TxtCondRegExpr : return value.find( QRegExp( txtValue ) ) != -1; break;
+ case TxtCondRegExpr : return value.find( TQRegExp( txtValue ) ) != -1; break;
- case TxtCondNotRegExpr : return value.find( QRegExp( txtValue ) ) == -1; break;
+ case TxtCondNotRegExpr : return value.find( TQRegExp( txtValue ) ) == -1; break;
default : return false;
}
@@ -182,9 +182,9 @@ bool FilterItemCriteria::checkNum( uint value ) const
void FilterItemCriteria::print( ) const
{
- QString output;
+ TQString output;
- output.append( QString( "Criteria %1 of Filter %2: Source: " ).arg( CriteriaNumber ).arg( FilterNumber ) );
+ output.append( TQString( "Criteria %1 of Filter %2: Source: " ).arg( CriteriaNumber ).arg( FilterNumber ) );
switch( source )
{
@@ -203,26 +203,26 @@ void FilterItemCriteria::print( ) const
{
switch( numCondition )
{
- case NumCondEqual : output.append( QString( "equals %1" ).arg( numValue ) ); break;
- case NumCondGreater : output.append( QString( "greater than %1" ).arg( numValue ) ); break;
- case NumCondGreaterEqual : output.append( QString( "greater than or equals %1" ).arg( numValue ) ); break;
- case NumCondLess : output.append( QString( "less than %1" ).arg( numValue ) ); break;
- case NumCondLessEqual : output.append( QString( "less than or equals %1" ).arg( numValue ) ); break;
- case NumCondNotEqual : output.append( QString( "not equals %1" ).arg( numValue ) ); break;
- default : output.append( QString( "unknown; Value: %1" ).arg( numValue ) ); break;
+ case NumCondEqual : output.append( TQString( "equals %1" ).arg( numValue ) ); break;
+ case NumCondGreater : output.append( TQString( "greater than %1" ).arg( numValue ) ); break;
+ case NumCondGreaterEqual : output.append( TQString( "greater than or equals %1" ).arg( numValue ) ); break;
+ case NumCondLess : output.append( TQString( "less than %1" ).arg( numValue ) ); break;
+ case NumCondLessEqual : output.append( TQString( "less than or equals %1" ).arg( numValue ) ); break;
+ case NumCondNotEqual : output.append( TQString( "not equals %1" ).arg( numValue ) ); break;
+ default : output.append( TQString( "unknown; Value: %1" ).arg( numValue ) ); break;
}
}
else
{
switch( txtCondition )
{
- case TxtCondContains : output.append( QString( "contains %1" ).arg( txtValue ) ); break;
- case TxtCondEqual : output.append( QString( "equals %1" ).arg( txtValue ) ); break;
- case TxtCondNotContains : output.append( QString( "not contains %1" ).arg( txtValue ) ); break;
- case TxtCondNotEqual : output.append( QString( "not equals %1" ).arg( txtValue ) ); break;
- case TxtCondRegExpr : output.append( QString( "matches to regular expression %1" ).arg( txtValue ) ); break;
- case TxtCondNotRegExpr : output.append( QString( "doesn't match to regular expression %1" ).arg( txtValue ) ); break;
- default : output.append( QString( "unknown; Value: %1" ).arg( txtValue ) ); break;
+ case TxtCondContains : output.append( TQString( "contains %1" ).arg( txtValue ) ); break;
+ case TxtCondEqual : output.append( TQString( "equals %1" ).arg( txtValue ) ); break;
+ case TxtCondNotContains : output.append( TQString( "not contains %1" ).arg( txtValue ) ); break;
+ case TxtCondNotEqual : output.append( TQString( "not equals %1" ).arg( txtValue ) ); break;
+ case TxtCondRegExpr : output.append( TQString( "matches to regular expression %1" ).arg( txtValue ) ); break;
+ case TxtCondNotRegExpr : output.append( TQString( "doesn't match to regular expression %1" ).arg( txtValue ) ); break;
+ default : output.append( TQString( "unknown; Value: %1" ).arg( txtValue ) ); break;
}
if( txtCondition != TxtCondRegExpr && txtCondition != TxtCondNotRegExpr )
diff --git a/kshowmail/filteritemcriteria.h b/kshowmail/filteritemcriteria.h
index eaa4d49..0546c2f 100644
--- a/kshowmail/filteritemcriteria.h
+++ b/kshowmail/filteritemcriteria.h
@@ -12,13 +12,13 @@
#ifndef FILTERITEMCRITERIA_H
#define FILTERITEMCRITERIA_H
-//Qt headers
-#include <qstring.h>
-#include <qregexp.h>
+//TQt headers
+#include <ntqstring.h>
+#include <ntqregexp.h>
//KDE headers
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
#include <kdebug.h>
//Kshowmail headers
@@ -57,7 +57,7 @@ class FilterItemCriteria{
* @param account Account
* @return TRUE - the criteria matches; FALSE - the criteria doesn't match
*/
- bool check( QString from, QString to, uint size, QString subject, QString header, QString account ) const;
+ bool check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account ) const;
/**
* Prints the settings.
@@ -69,7 +69,7 @@ class FilterItemCriteria{
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Types of source.
@@ -104,7 +104,7 @@ class FilterItemCriteria{
/**
* Text Value
*/
- QString txtValue;
+ TQString txtValue;
/**
* Numeric Value
@@ -133,7 +133,7 @@ class FilterItemCriteria{
* @param value Value to compare
* @return TRUE - value matches; FALSE - value doesn't match
*/
- bool checkText( QString value ) const;
+ bool checkText( TQString value ) const;
/**
* Compares a numeric value.
diff --git a/kshowmail/filterlog.cpp b/kshowmail/filterlog.cpp
index 73665cd..38484cb 100644
--- a/kshowmail/filterlog.cpp
+++ b/kshowmail/filterlog.cpp
@@ -14,7 +14,7 @@
FilterLog::FilterLog()
{
//get the application config object
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load the setup
loadSetup();
@@ -28,19 +28,19 @@ FilterLog::~FilterLog()
{
}
-void FilterLog::addDeletedMail(const QDateTime & dateTime, const QString & sender, const QString & account, const QString & subject)
+void FilterLog::addDeletedMail(const TQDateTime & dateTime, const TQString & sender, const TQString & account, const TQString & subject)
{
if( logDeletedMails )
addEntry( FActDelete, dateTime, sender, account, subject, "" );
}
-void FilterLog::addMovedMail(const QDateTime & dateTime, const QString & sender, const QString & account, const QString & subject, const QString & mailbox)
+void FilterLog::addMovedMail(const TQDateTime & dateTime, const TQString & sender, const TQString & account, const TQString & subject, const TQString & mailbox)
{
if( logMovedMails )
addEntry( FActMove, dateTime, sender, account, subject, mailbox );
}
-void FilterLog::addEntry(FilterAction_Type action, const QDateTime & dateTime, const QString & sender, const QString & account, const QString & subject, const QString & mailbox)
+void FilterLog::addEntry(FilterAction_Type action, const TQDateTime & dateTime, const TQString & sender, const TQString & account, const TQString & subject, const TQString & mailbox)
{
//create entry
FilterLogEntry entry = FilterLogEntry( action, dateTime, sender, account, subject, mailbox );
@@ -88,14 +88,14 @@ void FilterLog::clearMovedMailsLog()
void FilterLog::save()
{
//maybe we have to remove old entries, calculate minimum date
- QDateTime minTime = QDateTime::currentDateTime();
+ TQDateTime minTime = TQDateTime::currentDateTime();
minTime = minTime.addDays( daysStoreDeletedMails * -1 );
//we need a XML document
- QDomDocument doc( LOG_DOCTYPE );
+ TQDomDocument doc( LOG_DOCTYPE );
//and a root element
- QDomElement rootElem = doc.createElement( LOG_ROOT_ELEMENT );
+ TQDomElement rootElem = doc.createElement( LOG_ROOT_ELEMENT );
doc.appendChild( rootElem );
//store the entries of the deleted mails list into the document
@@ -112,14 +112,14 @@ void FilterLog::save()
//get the name of the file to save
- QString filename = locateLocal( "appdata", LOG_FILE );
+ TQString filename = locateLocal( "appdata", LOG_FILE );
//and save
- QFile file( filename );
+ TQFile file( filename );
if ( file.open( IO_WriteOnly ) ) //open file
{
- QTextStream stream( &file );
+ TQTextStream stream( &file );
doc.save( stream, 2 );
file.close();
}
@@ -132,17 +132,17 @@ void FilterLog::save()
void FilterLog::load()
{
//maybe we have to remove old entries, calculate minimum date
- QDateTime minTime = QDateTime::currentDateTime();
+ TQDateTime minTime = TQDateTime::currentDateTime();
minTime = minTime.addDays( daysStoreDeletedMails * -1 );
//we need a XML document
- QDomDocument doc( LOG_DOCTYPE );
+ TQDomDocument doc( LOG_DOCTYPE );
//get the name of the file
- QString filename = locateLocal( "appdata", LOG_FILE );
+ TQString filename = locateLocal( "appdata", LOG_FILE );
//load the log from file into the DOM document
- QFile file( filename );
+ TQFile file( filename );
if ( !file.open( IO_ReadOnly ) )
return; //return, if the file can't opened
@@ -156,21 +156,21 @@ void FilterLog::load()
file.close();
//iterate over all DOM elements and generate the log entries
- QDomElement docElem = doc.documentElement(); //get root element
+ TQDomElement docElem = doc.documentElement(); //get root element
//return, if the root element is not LOG_ROOT_ELEMENT
if( docElem.tagName() != LOG_ROOT_ELEMENT ) return;
- QDomNode n = docElem.firstChild(); //get first child (this is the first log entry)
+ TQDomNode n = docElem.firstChild(); //get first child (this is the first log entry)
while( !n.isNull() )
{
- QDomElement e = n.toElement(); //try to convert the node to an element.
+ TQDomElement e = n.toElement(); //try to convert the node to an element.
if( !e.isNull() )
{
if( e.tagName() == LOG_ENTRY_ELEMENT )
{
//add the read entry to the list of deleted mails
- QDateTime mailTime = QDateTime::fromString( e.attribute( LOG_ENTRY_ATTRIBUTE_DATETIME ), Qt::ISODate );
+ TQDateTime mailTime = TQDateTime::fromString( e.attribute( LOG_ENTRY_ATTRIBUTE_DATETIME ), TQt::ISODate );
if( mailTime >= minTime )
addDeletedMail( mailTime,
e.attribute( LOG_ENTRY_ATTRIBUTE_SENDER ),
@@ -201,7 +201,7 @@ void FilterLog::loadSetup( )
if( logDeletedMails )
{
- QString storageMode = config->readEntry(CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS );
+ TQString storageMode = config->readEntry(CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS );
if( storageMode == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
deletedMailsStorageMode = exit;
else if( storageMode == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
diff --git a/kshowmail/filterlog.h b/kshowmail/filterlog.h
index 9896796..e5d55c8 100644
--- a/kshowmail/filterlog.h
+++ b/kshowmail/filterlog.h
@@ -12,20 +12,20 @@
#ifndef FILTERLOG_H
#define FILTERLOG_H
-//Qt headers
-#include <qvaluelist.h>
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qtextstream.h>
+//TQt headers
+#include <ntqvaluelist.h>
+#include <ntqdatetime.h>
+#include <ntqdom.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
//KDE headers
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
//KShowmail headers
#include "filterlogentry.h"
@@ -39,7 +39,7 @@
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-typedef QValueList<FilterLogEntry> LogEntryList;
+typedef TQValueList<FilterLogEntry> LogEntryList;
class FilterLog{
@@ -64,7 +64,7 @@ class FilterLog{
* @param account Account which has received the mail
* @param subject Subject of the mail
*/
- void addDeletedMail( const QDateTime& dateTime, const QString& sender, const QString& account, const QString& subject );
+ void addDeletedMail( const TQDateTime& dateTime, const TQString& sender, const TQString& account, const TQString& subject );
/**
* Adds an entry about a moved mail.
@@ -74,7 +74,7 @@ class FilterLog{
* @param subject Subject of the mail
* @param mailbox mailbox
*/
- void addMovedMail( const QDateTime& dateTime, const QString& sender, const QString& account, const QString& subject, const QString& mailbox );
+ void addMovedMail( const TQDateTime& dateTime, const TQString& sender, const TQString& account, const TQString& subject, const TQString& mailbox );
/**
* Prints the log state.
@@ -136,7 +136,7 @@ class FilterLog{
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* List of entries about deleted mails.
@@ -175,7 +175,7 @@ class FilterLog{
* adds an entry.
* The target list will be coose on the basis of the given filter action.
*/
- void addEntry( FilterAction_Type action, const QDateTime& dateTime, const QString& sender, const QString& account, const QString& subject, const QString& mailbox = QString::null );
+ void addEntry( FilterAction_Type action, const TQDateTime& dateTime, const TQString& sender, const TQString& account, const TQString& subject, const TQString& mailbox = TQString::null );
};
diff --git a/kshowmail/filterlogentry.cpp b/kshowmail/filterlogentry.cpp
index 8f9af1c..8928b91 100644
--- a/kshowmail/filterlogentry.cpp
+++ b/kshowmail/filterlogentry.cpp
@@ -16,12 +16,12 @@
FilterLogEntry::FilterLogEntry()
{
//set default values
- sentDateTime.setDate( QDate( 2007, 11, 7 ) );
- sentDateTime.setTime( QTime( 19, 05 ) );
+ sentDateTime.setDate( TQDate( 2007, 11, 7 ) );
+ sentDateTime.setTime( TQTime( 19, 05 ) );
act = FActNone;
}
-FilterLogEntry::FilterLogEntry( FilterAction_Type action, const QDateTime& dateTime, const QString& sender, const QString& account, const QString& subject, const QString& mailbox)
+FilterLogEntry::FilterLogEntry( FilterAction_Type action, const TQDateTime& dateTime, const TQString& sender, const TQString& account, const TQString& subject, const TQString& mailbox)
: act( action ), sentDateTime( dateTime ), sender( sender ), account( account ), subject( subject ), mailbox( mailbox )
{
}
@@ -32,19 +32,19 @@ FilterLogEntry::~FilterLogEntry()
void FilterLogEntry::print()
{
- QString strAction;
+ TQString strAction;
switch( act )
{
case FActPass : strAction = "Passed"; break;
case FActDelete : strAction = "Deleted"; break;
case FActMark : strAction = "Marked"; break;
case FActSpamcheck : strAction = "forwarded to check for spam"; break;
- case FActMove : strAction = QString( "moved to %1" ).arg( mailbox); break;
+ case FActMove : strAction = TQString( "moved to %1" ).arg( mailbox); break;
case FActNone : strAction = "no Action (THIS IS AN ERROR!)"; break;
default : strAction = "ERROR! UNKNOWN ACTION"; break;
}
- kdDebug() << sentDateTime.toString( Qt::LocalDate ) << ";" << account << ";" << sender << ";" << subject << ";" << strAction << endl;
+ kdDebug() << sentDateTime.toString( TQt::LocalDate ) << ";" << account << ";" << sender << ";" << subject << ";" << strAction << endl;
}
FilterLogEntry::FilterLogEntry(const FilterLogEntry & ent)
@@ -73,7 +73,7 @@ FilterLogEntry& FilterLogEntry::operator=( const FilterLogEntry & ent )
bool FilterLogEntry::isOlder( uint days )
{
- return sentDateTime.date().addDays( days ) < QDate::currentDate();
+ return sentDateTime.date().addDays( days ) < TQDate::currentDate();
}
bool FilterLogEntry::operator== ( const FilterLogEntry& ent ) const
@@ -106,11 +106,11 @@ bool FilterLogEntry::operator<=( const FilterLogEntry & ent ) const
return sentDateTime <= ent.sentDateTime;
}
-void FilterLogEntry::save( QDomDocument& doc, QDomElement& parent )
+void FilterLogEntry::save( TQDomDocument& doc, TQDomElement& parent )
{
//create a new element and store the entry
- QDomElement elem = doc.createElement( LOG_ENTRY_ELEMENT );
- elem.setAttribute( LOG_ENTRY_ATTRIBUTE_DATETIME, sentDateTime.toString( Qt::ISODate) );
+ TQDomElement elem = doc.createElement( LOG_ENTRY_ELEMENT );
+ elem.setAttribute( LOG_ENTRY_ATTRIBUTE_DATETIME, sentDateTime.toString( TQt::ISODate) );
elem.setAttribute( LOG_ENTRY_ATTRIBUTE_SENDER, sender );
elem.setAttribute( LOG_ENTRY_ATTRIBUTE_ACCOUNT, account );
elem.setAttribute( LOG_ENTRY_ATTRIBUTE_SUBJECT, subject );
@@ -119,27 +119,27 @@ void FilterLogEntry::save( QDomDocument& doc, QDomElement& parent )
parent.appendChild( elem );
}
-QDateTime FilterLogEntry::getDate( )
+TQDateTime FilterLogEntry::getDate( )
{
return sentDateTime;
}
-QString FilterLogEntry::getSender( )
+TQString FilterLogEntry::getSender( )
{
return sender;
}
-QString FilterLogEntry::getAccount( )
+TQString FilterLogEntry::getAccount( )
{
return account;
}
-QString FilterLogEntry::getSubject( )
+TQString FilterLogEntry::getSubject( )
{
return subject;
}
-QString FilterLogEntry::getMailbox( )
+TQString FilterLogEntry::getMailbox( )
{
return mailbox;
}
diff --git a/kshowmail/filterlogentry.h b/kshowmail/filterlogentry.h
index 9dbd1be..74eb509 100644
--- a/kshowmail/filterlogentry.h
+++ b/kshowmail/filterlogentry.h
@@ -12,10 +12,10 @@
#ifndef FILTERLOGENTRY_H
#define FILTERLOGENTRY_H
-//Qt headers
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qdom.h>
+//TQt headers
+#include <ntqdatetime.h>
+#include <ntqstring.h>
+#include <ntqdom.h>
//KDE headers
#include <kdebug.h>
@@ -51,7 +51,7 @@ class FilterLogEntry{
* @param subject Subject of the mail
* @param mailbox mailbox where the mails was moved
*/
- FilterLogEntry( FilterAction_Type action, const QDateTime& dateTime, const QString& sender, const QString& account, const QString& subject, const QString& mailbox = QString::null );
+ FilterLogEntry( FilterAction_Type action, const TQDateTime& dateTime, const TQString& sender, const TQString& account, const TQString& subject, const TQString& mailbox = TQString::null );
/**
* Copy Constructor
@@ -127,37 +127,37 @@ class FilterLogEntry{
/**
* Stores the entry into the given DOM document as child of the given DOM element.
*/
- void save( QDomDocument& doc, QDomElement& parent );
+ void save( TQDomDocument& doc, TQDomElement& parent );
/**
* Returns the date and time of send
* @return send date and time
*/
- QDateTime getDate();
+ TQDateTime getDate();
/**
* Returns the sender.
* @return Sender
*/
- QString getSender();
+ TQString getSender();
/**
* Returns the account.
* @return Account
*/
- QString getAccount();
+ TQString getAccount();
/**
* Returns the subject
* @return Subject
*/
- QString getSubject();
+ TQString getSubject();
/**
* Returns the mailbox
* @return mailbox
*/
- QString getMailbox();
+ TQString getMailbox();
private:
@@ -169,27 +169,27 @@ class FilterLogEntry{
/**
* Delivery date and time
*/
- QDateTime sentDateTime;
+ TQDateTime sentDateTime;
/**
* Sender
*/
- QString sender;
+ TQString sender;
/**
* Account
*/
- QString account;
+ TQString account;
/**
* Subject
*/
- QString subject;
+ TQString subject;
/**
* mailbox if the mails was moved
*/
- QString mailbox;
+ TQString mailbox;
};
diff --git a/kshowmail/filterlogview.cpp b/kshowmail/filterlogview.cpp
index 22a4a54..af944ce 100644
--- a/kshowmail/filterlogview.cpp
+++ b/kshowmail/filterlogview.cpp
@@ -11,8 +11,8 @@
//
#include "filterlogview.h"
-FilterLogView::FilterLogView( QWidget *parent, FilterLog* log )
- : KDialogBase( parent, "FilterLogView", true, QString::null, Ok, Ok, true )
+FilterLogView::FilterLogView( TQWidget *parent, FilterLog* log )
+ : KDialogBase( parent, "FilterLogView", true, TQString::null, Ok, Ok, true )
{
//save the log pointer
this->log = log;
@@ -21,63 +21,63 @@ FilterLogView::FilterLogView( QWidget *parent, FilterLog* log )
setCaption( i18n( "Filter Log View" ) );
//main widget
- QWidget* pgMain = new QWidget( this );
+ TQWidget* pgMain = new TQWidget( this );
setMainWidget( pgMain );
//basic layout
- QVBoxLayout* layMain = new QVBoxLayout( pgMain, 0, spacingHint() );
+ TQVBoxLayout* layMain = new TQVBoxLayout( pgMain, 0, spacingHint() );
//view of deleted views
- QLabel* lblDeletedMails = new QLabel( i18n( "Deleted Mails:"), pgMain, "lblDeletedMails" );
+ TQLabel* lblDeletedMails = new TQLabel( i18n( "Deleted Mails:"), pgMain, "lblDeletedMails" );
layMain->addWidget( lblDeletedMails );
- lstViewDeleted = new KListView( pgMain, "lstViewDeleted" );
+ lstViewDeleted = new TDEListView( pgMain, "lstViewDeleted" );
lstViewDeleted->addColumn( i18n( "Date" ) );
lstViewDeleted->addColumn( i18n( "Sender" ) );
lstViewDeleted->addColumn( i18n( "Account" ) );
lstViewDeleted->addColumn( i18n( "Subject" ) );
- lstViewDeleted->setColumnWidthMode( 0, QListView::Maximum );
- lstViewDeleted->setColumnWidthMode( 1, QListView::Maximum );
- lstViewDeleted->setColumnWidthMode( 2, QListView::Maximum );
- lstViewDeleted->setColumnWidthMode( 3, QListView::Maximum );
- lstViewDeleted->setResizeMode( QListView::NoColumn );
+ lstViewDeleted->setColumnWidthMode( 0, TQListView::Maximum );
+ lstViewDeleted->setColumnWidthMode( 1, TQListView::Maximum );
+ lstViewDeleted->setColumnWidthMode( 2, TQListView::Maximum );
+ lstViewDeleted->setColumnWidthMode( 3, TQListView::Maximum );
+ lstViewDeleted->setResizeMode( TQListView::NoColumn );
lstViewDeleted->setSortColumn( 0 );
- lstViewDeleted->setSortOrder( Qt::Ascending );
+ lstViewDeleted->setSortOrder( TQt::Ascending );
layMain->addWidget( lstViewDeleted );
KPushButton* btnClearDeleted = new KPushButton( KStdGuiItem::clear(), pgMain, "btnClearDeleted" );
- QToolTip::add( btnClearDeleted, i18n( "Clear the list of deleted mails" ) );
+ TQToolTip::add( btnClearDeleted, i18n( "Clear the list of deleted mails" ) );
connect( btnClearDeleted, SIGNAL( clicked() ), this, SLOT( slotClearDeletedMails() ) );
- btnClearDeleted->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+ btnClearDeleted->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
layMain->addWidget( btnClearDeleted );
//create a seperator
layMain->addWidget( new KSeparator( pgMain ) );
//view of deleted views
- QLabel* lblMovedMails = new QLabel( i18n( "Moved Mails:"), pgMain, "lblMovedMails" );
+ TQLabel* lblMovedMails = new TQLabel( i18n( "Moved Mails:"), pgMain, "lblMovedMails" );
layMain->addWidget( lblMovedMails );
- lstViewMoved = new KListView( pgMain, "lstViewMoved" );
+ lstViewMoved = new TDEListView( pgMain, "lstViewMoved" );
lstViewMoved->addColumn( i18n( "Date" ) );
lstViewMoved->addColumn( i18n( "Sender" ) );
lstViewMoved->addColumn( i18n( "Account" ) );
lstViewMoved->addColumn( i18n( "Moved To" ) );
lstViewMoved->addColumn( i18n( "Subject" ) );
- lstViewMoved->setColumnWidthMode( 0, QListView::Maximum );
- lstViewMoved->setColumnWidthMode( 1, QListView::Maximum );
- lstViewMoved->setColumnWidthMode( 2, QListView::Maximum );
- lstViewMoved->setColumnWidthMode( 3, QListView::Maximum );
- lstViewMoved->setColumnWidthMode( 4, QListView::Maximum );
- lstViewMoved->setResizeMode( QListView::NoColumn );
+ lstViewMoved->setColumnWidthMode( 0, TQListView::Maximum );
+ lstViewMoved->setColumnWidthMode( 1, TQListView::Maximum );
+ lstViewMoved->setColumnWidthMode( 2, TQListView::Maximum );
+ lstViewMoved->setColumnWidthMode( 3, TQListView::Maximum );
+ lstViewMoved->setColumnWidthMode( 4, TQListView::Maximum );
+ lstViewMoved->setResizeMode( TQListView::NoColumn );
lstViewMoved->setSortColumn( 0 );
- lstViewMoved->setSortOrder( Qt::Ascending );
+ lstViewMoved->setSortOrder( TQt::Ascending );
layMain->addWidget( lstViewMoved );
KPushButton* btnClearMoved = new KPushButton( KStdGuiItem::clear(), pgMain, "btnClearMoved" );
- QToolTip::add( btnClearMoved, i18n( "Clear the list of moved mails" ) );
+ TQToolTip::add( btnClearMoved, i18n( "Clear the list of moved mails" ) );
connect( btnClearMoved, SIGNAL( clicked() ), this, SLOT( slotClearMovedMails() ) );
- btnClearMoved->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+ btnClearMoved->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
layMain->addWidget( btnClearMoved );
//now we load the content for the list views
diff --git a/kshowmail/filterlogview.h b/kshowmail/filterlogview.h
index a138de8..b60d1b9 100644
--- a/kshowmail/filterlogview.h
+++ b/kshowmail/filterlogview.h
@@ -12,15 +12,15 @@
#ifndef FILTERLOGVIEW_H
#define FILTERLOGVIEW_H
-//Qt headers
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtooltip.h>
+//TQt headers
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqtooltip.h>
//KDE headers
#include <kdialogbase.h>
-#include <klocale.h>
-#include <klistview.h>
+#include <tdelocale.h>
+#include <tdelistview.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <kseparator.h>
@@ -46,7 +46,7 @@ Q_OBJECT
* @param parent pointer to the parent widget
* @param log pointer to the filter log
*/
- FilterLogView( QWidget* parent = NULL, FilterLog* log = NULL );
+ FilterLogView( TQWidget* parent = NULL, FilterLog* log = NULL );
/**
* Destructor
@@ -63,12 +63,12 @@ Q_OBJECT
/**
* List view of deleted mails
*/
- KListView* lstViewDeleted;
+ TDEListView* lstViewDeleted;
/**
* List view of moved mails
*/
- KListView* lstViewMoved;
+ TDEListView* lstViewMoved;
private slots:
diff --git a/kshowmail/filterlogviewdeleteditem.cpp b/kshowmail/filterlogviewdeleteditem.cpp
index 587f079..45e5bf4 100644
--- a/kshowmail/filterlogviewdeleteditem.cpp
+++ b/kshowmail/filterlogviewdeleteditem.cpp
@@ -11,8 +11,8 @@
//
#include "filterlogviewdeleteditem.h"
-FilterLogViewDeletedItem::FilterLogViewDeletedItem( KListView* parent )
- : KListViewItem( parent )
+FilterLogViewDeletedItem::FilterLogViewDeletedItem( TDEListView* parent )
+ : TDEListViewItem( parent )
{
}
@@ -21,7 +21,7 @@ FilterLogViewDeletedItem::~FilterLogViewDeletedItem()
{
}
-void FilterLogViewDeletedItem::setValues( QDateTime date, QString sender, QString account, QString subject )
+void FilterLogViewDeletedItem::setValues( TQDateTime date, TQString sender, TQString account, TQString subject )
{
//store values
this->date = date;
@@ -30,13 +30,13 @@ void FilterLogViewDeletedItem::setValues( QDateTime date, QString sender, QStrin
this->subject = subject;
//set column text
- setText( ColDate, date.toString( Qt::LocalDate ) );
+ setText( ColDate, date.toString( TQt::LocalDate ) );
setText( ColSender, sender );
setText( ColAccount, account );
setText( ColSubject, subject );
}
-int FilterLogViewDeletedItem::compare( QListViewItem * i, int col, bool ascending ) const
+int FilterLogViewDeletedItem::compare( TQListViewItem * i, int col, bool ascending ) const
{
if( col == ColDate )
{
@@ -49,7 +49,7 @@ int FilterLogViewDeletedItem::compare( QListViewItem * i, int col, bool ascendin
}
-QDateTime FilterLogViewDeletedItem::getDate( )
+TQDateTime FilterLogViewDeletedItem::getDate( )
{
return date;
}
diff --git a/kshowmail/filterlogviewdeleteditem.h b/kshowmail/filterlogviewdeleteditem.h
index 6692106..f00f839 100644
--- a/kshowmail/filterlogviewdeleteditem.h
+++ b/kshowmail/filterlogviewdeleteditem.h
@@ -12,17 +12,17 @@
#ifndef FILTERLOGVIEWDELETEDITEM_H
#define FILTERLOGVIEWDELETEDITEM_H
-//Qt Headers
-#include <qdatetime.h>
+//TQt Headers
+#include <ntqdatetime.h>
//KDE headers
-#include <klistview.h>
+#include <tdelistview.h>
/**
* @brief Item of the filter log view of deleted mails
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class FilterLogViewDeletedItem : public KListViewItem
+class FilterLogViewDeletedItem : public TDEListViewItem
{
public:
@@ -36,7 +36,7 @@ class FilterLogViewDeletedItem : public KListViewItem
* Constructor
* @param parent the log view of this items
*/
- FilterLogViewDeletedItem( KListView* parent );
+ FilterLogViewDeletedItem( TDEListView* parent );
/**
* Destrutor
@@ -50,23 +50,23 @@ class FilterLogViewDeletedItem : public KListViewItem
* @param account account
* @param subject mail subject
*/
- void setValues( QDateTime date, QString sender, QString account, QString subject );
+ void setValues( TQDateTime date, TQString sender, TQString account, TQString subject );
/**
- * Reimplemantation of QListViewItem::compare.
+ * Reimplemantation of TQListViewItem::compare.
* Compares this list view item to i using the column col in ascending order. Returns <0 if this item is less than i,
* 0 if they are equal and >0 if this item is greater than i. The parameter ascneding will be ignored.
* @param i pointer to the second view item
* @param col number of the sorted column
* @param ascending ignored
*/
- virtual int compare( QListViewItem* i, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
/**
* Returns the date of sent
* @return date of sent
*/
- QDateTime getDate();
+ TQDateTime getDate();
private:
@@ -74,22 +74,22 @@ class FilterLogViewDeletedItem : public KListViewItem
/**
* sent date and time
*/
- QDateTime date;
+ TQDateTime date;
/**
* sender of the mail
*/
- QString sender;
+ TQString sender;
/**
* Account
*/
- QString account;
+ TQString account;
/**
* mail subject
*/
- QString subject;
+ TQString subject;
};
#endif
diff --git a/kshowmail/filterlogviewmoveditem.cpp b/kshowmail/filterlogviewmoveditem.cpp
index 80b02ba..a68a1ae 100644
--- a/kshowmail/filterlogviewmoveditem.cpp
+++ b/kshowmail/filterlogviewmoveditem.cpp
@@ -11,8 +11,8 @@
//
#include "filterlogviewmoveditem.h"
-FilterLogViewMovedItem::FilterLogViewMovedItem( KListView * parent )
- : KListViewItem( parent )
+FilterLogViewMovedItem::FilterLogViewMovedItem( TDEListView * parent )
+ : TDEListViewItem( parent )
{
}
@@ -21,7 +21,7 @@ FilterLogViewMovedItem::~FilterLogViewMovedItem()
{
}
-void FilterLogViewMovedItem::setValues( QDateTime date, QString sender, QString account, QString mailbox, QString subject )
+void FilterLogViewMovedItem::setValues( TQDateTime date, TQString sender, TQString account, TQString mailbox, TQString subject )
{
//store values
this->date = date;
@@ -31,14 +31,14 @@ void FilterLogViewMovedItem::setValues( QDateTime date, QString sender, QString
this->subject = subject;
//set column text
- setText( ColDate, date.toString( Qt::LocalDate ) );
+ setText( ColDate, date.toString( TQt::LocalDate ) );
setText( ColSender, sender );
setText( ColAccount, account );
setText( ColMailbox, mailbox );
setText( ColSubject, subject );
}
-int FilterLogViewMovedItem::compare( QListViewItem * i, int col, bool ascending ) const
+int FilterLogViewMovedItem::compare( TQListViewItem * i, int col, bool ascending ) const
{
if( col == ColDate )
{
@@ -51,7 +51,7 @@ int FilterLogViewMovedItem::compare( QListViewItem * i, int col, bool ascending
}
-QDateTime FilterLogViewMovedItem::getDate( )
+TQDateTime FilterLogViewMovedItem::getDate( )
{
return date;
}
diff --git a/kshowmail/filterlogviewmoveditem.h b/kshowmail/filterlogviewmoveditem.h
index 9a7a7f8..3c2367d 100644
--- a/kshowmail/filterlogviewmoveditem.h
+++ b/kshowmail/filterlogviewmoveditem.h
@@ -12,17 +12,17 @@
#ifndef FILTERLOGVIEWMOVEDITEM_H
#define FILTERLOGVIEWMOVEDITEM_H
-//Qt Headers
-#include <qdatetime.h>
+//TQt Headers
+#include <ntqdatetime.h>
//KDE headers
-#include <klistview.h>
+#include <tdelistview.h>
/**
* @brief Item of the filter log view of moved mails
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class FilterLogViewMovedItem : public KListViewItem
+class FilterLogViewMovedItem : public TDEListViewItem
{
public:
@@ -36,7 +36,7 @@ class FilterLogViewMovedItem : public KListViewItem
* Constructor
* @param parent the log view of this items
*/
- FilterLogViewMovedItem( KListView* parent);
+ FilterLogViewMovedItem( TDEListView* parent);
/**
* Destructor
@@ -51,23 +51,23 @@ class FilterLogViewMovedItem : public KListViewItem
* @param mailbox mailbox to which the mail was moved
* @param subject mail subject
*/
- void setValues( QDateTime date, QString sender, QString account, QString mailbox, QString subject );
+ void setValues( TQDateTime date, TQString sender, TQString account, TQString mailbox, TQString subject );
/**
- * Reimplemantation of QListViewItem::compare.
+ * Reimplemantation of TQListViewItem::compare.
* Compares this list view item to i using the column col in ascending order. Returns <0 if this item is less than i,
* 0 if they are equal and >0 if this item is greater than i. The parameter ascneding will be ignored.
* @param i pointer to the second view item
* @param col number of the sorted column
* @param ascending ignored
*/
- virtual int compare( QListViewItem* i, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
/**
* Returns the date of sent
* @return date of sent
*/
- QDateTime getDate();
+ TQDateTime getDate();
private:
@@ -75,27 +75,27 @@ class FilterLogViewMovedItem : public KListViewItem
/**
* sent date and time
*/
- QDateTime date;
+ TQDateTime date;
/**
* sender of the mail
*/
- QString sender;
+ TQString sender;
/**
* Account
*/
- QString account;
+ TQString account;
/**
* mail subject
*/
- QString subject;
+ TQString subject;
/**
* mailbox
*/
- QString mailbox;
+ TQString mailbox;
};
#endif
diff --git a/kshowmail/headerfilter.cpp b/kshowmail/headerfilter.cpp
index 10bedf0..8d0c51d 100644
--- a/kshowmail/headerfilter.cpp
+++ b/kshowmail/headerfilter.cpp
@@ -14,7 +14,7 @@
HeaderFilter::HeaderFilter()
{
//get the application config object
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//the filter list shall delete all filters if it will be deleted itself
filters.setAutoDelete( true );
@@ -28,7 +28,7 @@ HeaderFilter::~HeaderFilter()
{
}
-FilterAction_Type HeaderFilter::check( QString from, QString to, uint size, QString subject, QString header, QString account, QString& mailboxName ) const
+FilterAction_Type HeaderFilter::check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account, TQString& mailboxName ) const
{
//return PASS, if filter is not active
if( !active )
@@ -39,7 +39,7 @@ FilterAction_Type HeaderFilter::check( QString from, QString to, uint size, QStr
if( action != FActNone ) return action;
//check for matching with filters
- QPtrListIterator<FilterItem> it( filters );
+ TQPtrListIterator<FilterItem> it( filters );
FilterItem* filter;
while( ( filter = it.current() ) != NULL )
{
@@ -119,7 +119,7 @@ void HeaderFilter::print( )
kdDebug() << endl;
kdDebug() << "Number of filters: " << numberFilterItems << endl << endl;
- QPtrListIterator<FilterItem> it( filters );
+ TQPtrListIterator<FilterItem> it( filters );
FilterItem* filter;
while( ( filter = it.current() ) != NULL )
{
diff --git a/kshowmail/headerfilter.h b/kshowmail/headerfilter.h
index c17a626..da04b2d 100644
--- a/kshowmail/headerfilter.h
+++ b/kshowmail/headerfilter.h
@@ -12,14 +12,14 @@
#ifndef HEADERFILTER_H
#define HEADERFILTER_H
-//Qt headers
-#include <qstring.h>
-#include <qptrlist.h>
+//TQt headers
+#include <ntqstring.h>
+#include <ntqptrlist.h>
//KDE headers
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
//KShowmail headers
#include "constants.h"
@@ -58,7 +58,7 @@ class HeaderFilter{
* @param mailboxName contains the mailbox name after call, if filter action is MOVE
* @return recommend action
*/
- FilterAction_Type check( QString from, QString to, uint size, QString subject, QString header, QString account, QString& mailboxName ) const;
+ FilterAction_Type check( TQString from, TQString to, uint size, TQString subject, TQString header, TQString account, TQString& mailboxName ) const;
/**
* Loads the settings from the application config file.
@@ -81,7 +81,7 @@ class HeaderFilter{
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* TRUE - filter is active
@@ -96,7 +96,7 @@ class HeaderFilter{
/**
* mailbox name if default action is MOVE
*/
- QString mailbox;
+ TQString mailbox;
/**
* Number of filter items
@@ -111,7 +111,7 @@ class HeaderFilter{
/**
* This list holds the filter items
*/
- QPtrList<FilterItem> filters;
+ TQPtrList<FilterItem> filters;
};
#endif
diff --git a/kshowmail/kcmconfigs/Makefile.am b/kshowmail/kcmconfigs/Makefile.am
index 94cd555..567284c 100644
--- a/kshowmail/kcmconfigs/Makefile.am
+++ b/kshowmail/kcmconfigs/Makefile.am
@@ -7,7 +7,7 @@ kcm_kshowmailconfigactions_la_LDFLAGS = -avoid-version -module $(all_libraries)
noinst_HEADERS = accountsetupdialog.h accountsetupitem.h configaccounts.h \
configactions.h configdisplay.h configfilter.h configgeneral.h configlog.h \
configspamcheck.h encryption.h filtercriteriawidget.h filtersetupdialog.h \
- filtersetupitem.h kwalletaccess.h mailboxwizard.h mailboxwizardlistitem.h \
+ filtersetupitem.h tdewalletaccess.h mailboxwizard.h mailboxwizardlistitem.h \
senderlistdialog.h
kcm_kshowmailconfigactions_la_SOURCES = configactions.cpp
kde_services_DATA = kshowmailconfigaccounts.desktop \
@@ -22,7 +22,7 @@ kcm_kshowmailconfigdisplay_la_SOURCES = configdisplay.cpp
kcm_kshowmailconfigaccounts_la_LDFLAGS = -avoid-version -module\
$(all_libraries)
kcm_kshowmailconfigaccounts_la_SOURCES = configaccounts.cpp \
- accountsetupitem.cpp accountsetupdialog.cpp encryption.cpp kwalletaccess.cpp
+ accountsetupitem.cpp accountsetupdialog.cpp encryption.cpp tdewalletaccess.cpp
kcm_kshowmailconfigfilter_la_LDFLAGS = -avoid-version -module\
$(all_libraries)
kcm_kshowmailconfigfilter_la_SOURCES = configfilter.cpp senderlistdialog.cpp \
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index 6c6fe22..dc800ee 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -11,8 +11,8 @@
//
#include "accountsetupdialog.h"
-AccountSetupDialog::AccountSetupDialog( QWidget* parent, KListView* view, AccountSetupItem* item )
- : KDialogBase( parent, "AccountSetupDialog", true, QString::null, Ok|Cancel, Ok, true )
+AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, AccountSetupItem* item )
+ : KDialogBase( parent, "AccountSetupDialog", true, TQString::null, Ok|Cancel, Ok, true )
{
//save pointer to account and view
account = item;
@@ -23,78 +23,78 @@ AccountSetupDialog::AccountSetupDialog( QWidget* parent, KListView* view, Accoun
tabs->setMargin( 10 );
//pages
- QWidget* pgGeneral = new QWidget( this );
- QWidget* pgSecurity = new QWidget( this );
+ TQWidget* pgGeneral = new TQWidget( this );
+ TQWidget* pgSecurity = new TQWidget( this );
setMainWidget( tabs );
//layouts of general page
- QVBoxLayout* layGeneral = new QVBoxLayout( pgGeneral, 0, spacingHint() );
- QGridLayout* layTop = new QGridLayout( layGeneral, 5, 2 );
+ TQVBoxLayout* layGeneral = new TQVBoxLayout( pgGeneral, 0, spacingHint() );
+ TQGridLayout* layTop = new TQGridLayout( layGeneral, 5, 2 );
//layouts of security page
- QVBoxLayout* laySecurity = new QVBoxLayout( pgSecurity, 0, spacingHint() );
- laySecurity->setAlignment( Qt::AlignTop );
+ TQVBoxLayout* laySecurity = new TQVBoxLayout( pgSecurity, 0, spacingHint() );
+ laySecurity->setAlignment( TQt::AlignTop );
//upper items
- QLabel* lblAccount = new QLabel( i18n( "Account:" ), pgGeneral, "lblAccount" );
+ TQLabel* lblAccount = new TQLabel( i18n( "Account:" ), pgGeneral, "lblAccount" );
txtAccount = new KLineEdit( pgGeneral, "txtAccount" );
txtAccount->setFocus();
- QToolTip::add( lblAccount, i18n( "Unique Account Name" ) );
- QToolTip::add( txtAccount, i18n( "Unique Account Name" ) );
+ TQToolTip::add( lblAccount, i18n( "Unique Account Name" ) );
+ TQToolTip::add( txtAccount, i18n( "Unique Account Name" ) );
layTop->addWidget( lblAccount, 0, 0 );
layTop->addWidget( txtAccount, 0, 1 );
- QLabel* lblServer = new QLabel( i18n( "Server:" ), pgGeneral, "lblServer" );
+ TQLabel* lblServer = new TQLabel( i18n( "Server:" ), pgGeneral, "lblServer" );
txtServer = new KLineEdit( pgGeneral, "txtServer" );
- QToolTip::add( lblServer, i18n( "Server Name" ) );
- QToolTip::add( txtServer, i18n( "Server Name" ) );
+ TQToolTip::add( lblServer, i18n( "Server Name" ) );
+ TQToolTip::add( txtServer, i18n( "Server Name" ) );
layTop->addWidget( lblServer, 1, 0 );
layTop->addWidget( txtServer, 1, 1 );
- QLabel* lblProtocol = new QLabel( i18n( "Protocol:" ), pgGeneral, "lblProtocol" );
+ TQLabel* lblProtocol = new TQLabel( i18n( "Protocol:" ), pgGeneral, "lblProtocol" );
cboProtocol = new KComboBox( pgGeneral, "cboProtocol" );
cboProtocol->insertItem( "POP3" ); //currently KShowmail just supports POP3
- QToolTip::add( lblProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
- QToolTip::add( cboProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
+ TQToolTip::add( lblProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
+ TQToolTip::add( cboProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
layTop->addWidget( lblProtocol, 2, 0 );
layTop->addWidget( cboProtocol, 2, 1 );
- QLabel* lblPort = new QLabel( i18n( "Port:" ), pgGeneral, "lblPort" );
- spbPort = new QSpinBox( 0, 65535, 1, pgGeneral, "spbPort" );
+ TQLabel* lblPort = new TQLabel( i18n( "Port:" ), pgGeneral, "lblPort" );
+ spbPort = new TQSpinBox( 0, 65535, 1, pgGeneral, "spbPort" );
spbPort->setValue( DEFAULT_ACCOUNT_PORT_POP3 );
- QToolTip::add( lblPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
- QToolTip::add( spbPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
+ TQToolTip::add( lblPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
+ TQToolTip::add( spbPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
layTop->addWidget( lblPort, 3, 0 );
layTop->addWidget( spbPort, 3, 1 );
- QLabel* lblUser = new QLabel( i18n( "User:" ), pgGeneral, "lblUser" );
+ TQLabel* lblUser = new TQLabel( i18n( "User:" ), pgGeneral, "lblUser" );
txtUser = new KLineEdit( pgGeneral, "txtUser" );
- QToolTip::add( lblUser, i18n( "To authenticate to the mail server you need an user name." ) );
- QToolTip::add( txtUser, i18n( "To authenticate to the mail server you need an user name." ) );
+ TQToolTip::add( lblUser, i18n( "To authenticate to the mail server you need an user name." ) );
+ TQToolTip::add( txtUser, i18n( "To authenticate to the mail server you need an user name." ) );
layTop->addWidget( lblUser, 4, 0 );
layTop->addWidget( txtUser, 4, 1 );
//password groupbox and layouts
- QGroupBox* gboxPassword = new QGroupBox( 0, Qt::Horizontal, i18n( "Password" ), pgGeneral, "gboxPassword" );
+ TQGroupBox* gboxPassword = new TQGroupBox( 0, TQt::Horizontal, i18n( "Password" ), pgGeneral, "gboxPassword" );
layGeneral->addWidget( gboxPassword );
- QVBoxLayout* layPassword = new QVBoxLayout( gboxPassword->layout(), spacingHint() );
- QGridLayout* layPasswordStorage = new QGridLayout( layPassword, 2, 2, spacingHint() );
+ TQVBoxLayout* layPassword = new TQVBoxLayout( gboxPassword->layout(), spacingHint() );
+ TQGridLayout* layPasswordStorage = new TQGridLayout( layPassword, 2, 2, spacingHint() );
//radio buttons to set storage of the password
- grpPasswordStorage = new QButtonGroup( NULL, "grpPasswordStorage" );
+ grpPasswordStorage = new TQButtonGroup( NULL, "grpPasswordStorage" );
connect( grpPasswordStorage, SIGNAL( clicked( int ) ), this, SLOT( slotPasswordStorageChanged( int ) ) );
- QRadioButton* btnPasswordDontSave = new QRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
- QRadioButton* btnPasswordSaveFile = new QRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
- QRadioButton* btnPasswordSaveKWallet = new QRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
+ TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
+ TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
+ TQRadioButton* btnPasswordSaveKWallet = new TQRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
grpPasswordStorage->insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
- QToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
- QToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
- QToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
+ TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
+ TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
+ TQToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
layPasswordStorage->addWidget( btnPasswordDontSave, 0, 0 );
layPasswordStorage->addWidget( btnPasswordSaveFile, 0, 1 );
layPasswordStorage->addWidget( btnPasswordSaveKWallet, 1, 0 );
@@ -108,33 +108,33 @@ AccountSetupDialog::AccountSetupDialog( QWidget* parent, KListView* view, Accoun
slotPasswordStorageChanged( DEFAULT_ACCOUNT_PASSWORD_STORAGE );
//active check box
- QGridLayout* layActive = new QGridLayout( layGeneral, 1, 1 );
- layActive->setAlignment( Qt::AlignCenter );
- chkActive = new QCheckBox( i18n( "Active"), pgGeneral, "chkActive" );
- QToolTip::add( chkActive, i18n( "Select it to activate this account." ) );
+ TQGridLayout* layActive = new TQGridLayout( layGeneral, 1, 1 );
+ layActive->setAlignment( TQt::AlignCenter );
+ chkActive = new TQCheckBox( i18n( "Active"), pgGeneral, "chkActive" );
+ TQToolTip::add( chkActive, i18n( "Select it to activate this account." ) );
layActive->addWidget( chkActive, 0, 0 );
chkActive->setChecked( DEFAULT_ACCOUNT_ACTIVE );
//secure transfer groupbox and layouts
- QGroupBox* gboxSecureTransfer = new QGroupBox( 0, Qt::Horizontal, i18n( "Encryption" ), pgSecurity, "gboxSecureTransfer" );
- gboxSecureTransfer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum ) );
+ TQGroupBox* gboxSecureTransfer = new TQGroupBox( 0, TQt::Horizontal, i18n( "Encryption" ), pgSecurity, "gboxSecureTransfer" );
+ gboxSecureTransfer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ) );
laySecurity->addWidget( gboxSecureTransfer );
- QHBoxLayout* laySecureTransfer = new QHBoxLayout( gboxSecureTransfer->layout(), spacingHint() );
+ TQHBoxLayout* laySecureTransfer = new TQHBoxLayout( gboxSecureTransfer->layout(), spacingHint() );
//radio buttons to set secure transfer
- grpSecureTransfer = new QButtonGroup( NULL, "grpSecureTransfer" );
+ grpSecureTransfer = new TQButtonGroup( NULL, "grpSecureTransfer" );
connect( grpSecureTransfer, SIGNAL( clicked( int ) ), this, SLOT( slotSecureTransferChanged ( int ) ) );
- QRadioButton* btnSecureTransferNone = new QRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
- QRadioButton* btnSecureTransferSSL = new QRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );
- QRadioButton* btnSecureTransferTLS = new QRadioButton( i18n( "TLS" ), gboxSecureTransfer, "btnSecureTransferTLS" );
+ TQRadioButton* btnSecureTransferNone = new TQRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
+ TQRadioButton* btnSecureTransferSSL = new TQRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );
+ TQRadioButton* btnSecureTransferTLS = new TQRadioButton( i18n( "TLS" ), gboxSecureTransfer, "btnSecureTransferTLS" );
grpSecureTransfer->insert( btnSecureTransferNone, ID_BUTTON_SECTRANSFER_NONE );
grpSecureTransfer->insert( btnSecureTransferSSL, ID_BUTTON_SECTRANSFER_SSL );
grpSecureTransfer->insert( btnSecureTransferTLS, ID_BUTTON_SECTRANSFER_TLS );
- QToolTip::add( btnSecureTransferNone, i18n( "The download of the mail header and body will not be encrypted. Use this, if your provider doesn't make a secure transfer available." ) );
- QToolTip::add( btnSecureTransferSSL, i18n( "Secure Sockets Layer (SSL), is a cryptographic protocol that provides secure communications on the Internet." ) );
- QToolTip::add( btnSecureTransferTLS, i18n( "Transport Layer Security (TLS) is a cryptographic protocol that provides secure communications on the Internet. It is the successor of SSL." ) );
+ TQToolTip::add( btnSecureTransferNone, i18n( "The download of the mail header and body will not be encrypted. Use this, if your provider doesn't make a secure transfer available." ) );
+ TQToolTip::add( btnSecureTransferSSL, i18n( "Secure Sockets Layer (SSL), is a cryptographic protocol that provides secure communications on the Internet." ) );
+ TQToolTip::add( btnSecureTransferTLS, i18n( "Transport Layer Security (TLS) is a cryptographic protocol that provides secure communications on the Internet. It is the successor of SSL." ) );
laySecureTransfer->addWidget( btnSecureTransferNone );
laySecureTransfer->addWidget( btnSecureTransferSSL );
laySecureTransfer->addWidget( btnSecureTransferTLS );
@@ -255,8 +255,8 @@ void AccountSetupDialog::slotOk( )
//therefore we use setText(). But if we use this method, KPasswordEdit::password()
//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
//will return the correct password
- QString pass;
- if( txtPassword->password() == "" || txtPassword->password() == QString::null )
+ TQString pass;
+ if( txtPassword->password() == "" || txtPassword->password() == TQString::null )
pass = txtPassword->text();
else
pass = txtPassword->password();
@@ -264,7 +264,7 @@ void AccountSetupDialog::slotOk( )
switch( grpPasswordStorage->selectedId() )
{
case ID_BUTTON_PASSWORD_DONT_SAVE : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
- account->setPassword( QString::null );
+ account->setPassword( TQString::null );
break;
case ID_BUTTON_PASSWORD_SAVE_FILE : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
account->setPassword( pass );
@@ -273,7 +273,7 @@ void AccountSetupDialog::slotOk( )
account->setPassword( pass );
break;
default : account->setPasswordStorageType( -1 );
- account->setPassword( QString::null );
+ account->setPassword( TQString::null );
}
account->setActive( chkActive->isChecked() );
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.h b/kshowmail/kcmconfigs/accountsetupdialog.h
index 756f51e..257e549 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.h
+++ b/kshowmail/kcmconfigs/accountsetupdialog.h
@@ -12,23 +12,23 @@
#ifndef ACCOUNTSETUPDIALOG_H
#define ACCOUNTSETUPDIALOG_H
-//Qt headers
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqtooltip.h>
+#include <ntqspinbox.h>
+#include <ntqgroupbox.h>
+#include <ntqbuttongroup.h>
+#include <ntqradiobutton.h>
+#include <ntqcheckbox.h>
//KDE headers
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <ktabwidget.h>
@@ -64,7 +64,7 @@ Q_OBJECT
* @param view view which shows the items
* @param item account to setup; if NULL, a new item will be created
*/
- AccountSetupDialog( QWidget* parent, KListView* view, AccountSetupItem* item = NULL );
+ AccountSetupDialog( TQWidget* parent, TDEListView* view, AccountSetupItem* item = NULL );
/**
* Destructor
@@ -81,7 +81,7 @@ Q_OBJECT
/**
* View which shows the account items.
*/
- KListView* ListView;
+ TDEListView* ListView;
/**
* Edit line which contains the unique account name.
@@ -101,7 +101,7 @@ Q_OBJECT
/**
* Spinbox to choose the tcp port.
*/
- QSpinBox* spbPort;
+ TQSpinBox* spbPort;
/**
* Edit line which contains the user name.
@@ -116,17 +116,17 @@ Q_OBJECT
/**
* Check box to select whether the account is active or not.
*/
- QCheckBox* chkActive;
+ TQCheckBox* chkActive;
/**
* Combines the radio buttons of password storage.
*/
- QButtonGroup* grpPasswordStorage;
+ TQButtonGroup* grpPasswordStorage;
/**
* Combines the radio buttons of secure transfer.
*/
- QButtonGroup* grpSecureTransfer;
+ TQButtonGroup* grpSecureTransfer;
protected slots:
diff --git a/kshowmail/kcmconfigs/accountsetupitem.cpp b/kshowmail/kcmconfigs/accountsetupitem.cpp
index f9f8431..d7846fe 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.cpp
+++ b/kshowmail/kcmconfigs/accountsetupitem.cpp
@@ -11,15 +11,15 @@
//
#include "accountsetupitem.h"
-AccountSetupItem::AccountSetupItem( KListView* parent )
- : KListViewItem( parent )
+AccountSetupItem::AccountSetupItem( TDEListView* parent )
+ : TDEListViewItem( parent )
{
init();
}
-AccountSetupItem::AccountSetupItem( KListView * parent, QString & name )
- : KListViewItem( parent )
+AccountSetupItem::AccountSetupItem( TDEListView * parent, TQString & name )
+ : TDEListViewItem( parent )
{
init();
@@ -48,35 +48,35 @@ void AccountSetupItem::init( )
_transferSecurity = DEFAULT_ACCOUNT_SECTRANSFER;
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
}
-void AccountSetupItem::setAccountName( const QString & name )
+void AccountSetupItem::setAccountName( const TQString & name )
{
_account = name;
}
-QString AccountSetupItem::getAccountName( ) const
+TQString AccountSetupItem::getAccountName( ) const
{
return _account;
}
-void AccountSetupItem::setServer( const QString & server )
+void AccountSetupItem::setServer( const TQString & server )
{
_server = server;
}
-QString AccountSetupItem::getServer( ) const
+TQString AccountSetupItem::getServer( ) const
{
return _server;
}
-void AccountSetupItem::setProtocol( const QString & protocol )
+void AccountSetupItem::setProtocol( const TQString & protocol )
{
_protocol = protocol;
}
-QString AccountSetupItem::getProtocol( ) const
+TQString AccountSetupItem::getProtocol( ) const
{
return _protocol;
}
@@ -94,22 +94,22 @@ int AccountSetupItem::getPort( ) const
return _port;
}
-void AccountSetupItem::setUser( const QString & user )
+void AccountSetupItem::setUser( const TQString & user )
{
_user = user;
}
-QString AccountSetupItem::getUser( ) const
+TQString AccountSetupItem::getUser( ) const
{
return _user;
}
-void AccountSetupItem::setPassword( const QString & password )
+void AccountSetupItem::setPassword( const TQString & password )
{
_password = password;
}
-QString AccountSetupItem::getPassword( ) const
+TQString AccountSetupItem::getPassword( ) const
{
return _password;
}
@@ -157,7 +157,7 @@ void AccountSetupItem::save() const
if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, crypt( url ) );
else
- config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, QString::null );
+ config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
//save password in KWallet if desired
if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
@@ -183,7 +183,7 @@ void AccountSetupItem::load( )
else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
_password = KWalletAccess::getPassword( getAccountName() );
else
- _password = QString::null;
+ _password = TQString::null;
_active = config->readBoolEntry( CONFIG_ENTRY_ACCOUNT_ACTIVE, DEFAULT_ACCOUNT_ACTIVE );
_transferSecurity = config->readNumEntry( CONFIG_ENTRY_ACCOUNT_SECTRANSFER, DEFAULT_ACCOUNT_SECTRANSFER );
diff --git a/kshowmail/kcmconfigs/accountsetupitem.h b/kshowmail/kcmconfigs/accountsetupitem.h
index fe85eee..f011646 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.h
+++ b/kshowmail/kcmconfigs/accountsetupitem.h
@@ -13,15 +13,15 @@
#define ACCOUNTSETUPITEM_H
//KDE headers
-#include <klistview.h>
-#include <kconfig.h>
+#include <tdelistview.h>
+#include <tdeconfig.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
//KShowmail headers
#include "../constants.h"
#include "encryption.h"
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
using namespace Encryption;
@@ -29,7 +29,7 @@ using namespace Encryption;
* @brief This class is used in ConfigAccounts to show the available accounts in the list view and to store an account setup.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class AccountSetupItem : public KListViewItem
+class AccountSetupItem : public TDEListViewItem
{
public:
@@ -37,14 +37,14 @@ class AccountSetupItem : public KListViewItem
* General Constructor
* @param parent the list view
*/
- AccountSetupItem( KListView* parent );
+ AccountSetupItem( TDEListView* parent );
/**
* Constructor
* @param parent the list view
* @param name account name
*/
- AccountSetupItem( KListView* parent, QString& name );
+ AccountSetupItem( TDEListView* parent, TQString& name );
/**
* Destructor
@@ -55,37 +55,37 @@ class AccountSetupItem : public KListViewItem
* Sets account name
* @param name account name
*/
- void setAccountName( const QString& name );
+ void setAccountName( const TQString& name );
/**
* Returns the account name.
* @return account name
*/
- QString getAccountName() const;
+ TQString getAccountName() const;
/**
* Sets the server.
* @param server server
*/
- void setServer( const QString& server );
+ void setServer( const TQString& server );
/**
* Returns the server.
* @return server
*/
- QString getServer() const;
+ TQString getServer() const;
/**
* Sets the protocol.
* @param protocol protocol
*/
- void setProtocol( const QString& protocol );
+ void setProtocol( const TQString& protocol );
/**
* Returns the protocol.
* @return protocol
*/
- QString getProtocol() const;
+ TQString getProtocol() const;
/**
* Sets the port number.
@@ -103,25 +103,25 @@ class AccountSetupItem : public KListViewItem
* Sets the user name.
* @param user user name
*/
- void setUser( const QString& user );
+ void setUser( const TQString& user );
/**
* Returns the user name.
* @return user name
*/
- QString getUser() const;
+ TQString getUser() const;
/**
* Sets the password.
* @param password password
*/
- void setPassword( const QString& password );
+ void setPassword( const TQString& password );
/**
* Returns the password.
* @return password
*/
- QString getPassword() const;
+ TQString getPassword() const;
/**
* Sets the password storage type.
@@ -181,22 +181,22 @@ class AccountSetupItem : public KListViewItem
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Account name
*/
- QString _account;
+ TQString _account;
/**
* Server
*/
- QString _server;
+ TQString _server;
/**
* Protocol
*/
- QString _protocol;
+ TQString _protocol;
/**
* Port
@@ -206,12 +206,12 @@ class AccountSetupItem : public KListViewItem
/**
* User Name
*/
- QString _user;
+ TQString _user;
/**
* Password
*/
- QString _password;
+ TQString _password;
/**
* TRUE - account is active
diff --git a/kshowmail/kcmconfigs/configaccounts.cpp b/kshowmail/kcmconfigs/configaccounts.cpp
index 3cb6d6c..327b8aa 100644
--- a/kshowmail/kcmconfigs/configaccounts.cpp
+++ b/kshowmail/kcmconfigs/configaccounts.cpp
@@ -11,13 +11,13 @@
//
#include "configaccounts.h"
-typedef KGenericFactory<ConfigAccounts, QWidget> ConfigAccountsFactory;
+typedef KGenericFactory<ConfigAccounts, TQWidget> ConfigAccountsFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfigaccounts, ConfigAccountsFactory(
"kcm_kshowmailconfigaccounts" ) );
-ConfigAccounts::ConfigAccounts( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigAccountsFactory::instance(), parent, args )
+ConfigAccounts::ConfigAccounts( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigAccountsFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -27,40 +27,40 @@ ConfigAccounts::ConfigAccounts( QWidget * parent, const char * name, const QStri
//---------
//main layout
- QHBoxLayout* layMain = new QHBoxLayout( this, 0, 10 );
+ TQHBoxLayout* layMain = new TQHBoxLayout( this, 0, 10 );
//account list view
- AccountListView = new KListView( this, "AccountListView" );
+ AccountListView = new TDEListView( this, "AccountListView" );
AccountListView->addColumn( i18n( "Name" ) );
- AccountListView->setColumnWidthMode( 0, QListView::Maximum );
- AccountListView->setResizeMode( QListView::LastColumn );
+ AccountListView->setColumnWidthMode( 0, TQListView::Maximum );
+ AccountListView->setResizeMode( TQListView::LastColumn );
layMain->addWidget( AccountListView );
//button layout
- QVBoxLayout* layButtons = new QVBoxLayout( layMain );
+ TQVBoxLayout* layButtons = new TQVBoxLayout( layMain );
//Buttons
btnAdd = new KPushButton( KStdGuiItem::add(), this, "btnAdd" );
layButtons->addWidget( btnAdd );
- btnAdd->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+ btnAdd->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
connect( btnAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );
btnEdit = new KPushButton( KStdGuiItem::configure(), this, "btnEdit" );
layButtons->addWidget( btnEdit );
- btnEdit->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+ btnEdit->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
connect( btnEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) );
btnRemove = new KPushButton( KStdGuiItem::remove(), this, "btnRemove" );
layButtons->addWidget( btnRemove );
- btnRemove->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+ btnRemove->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
connect( btnRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) );
- layButtons->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+ layButtons->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configured values
load();
@@ -75,10 +75,10 @@ void ConfigAccounts::load()
{
//get list of account names
config->setGroup( CONFIG_GROUP_ACCOUNTS );
- QStringList accounts = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, QStringList() );
+ TQStringList accounts = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, TQStringList() );
//create list view items and order accounts to load their config
- for( QStringList::Iterator it = accounts.begin(); it != accounts.end(); ++it )
+ for( TQStringList::Iterator it = accounts.begin(); it != accounts.end(); ++it )
{
//create item
AccountSetupItem* item = new AccountSetupItem( AccountListView, *it );
@@ -94,17 +94,17 @@ void ConfigAccounts::save()
config->setGroup( CONFIG_GROUP_ACCOUNTS );
//get old account list from config file to remove old account entries
- QStringList oldList = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, QStringList() );
+ TQStringList oldList = config->readListEntry( CONFIG_ENTRY_ACCOUNTS_LIST, TQStringList() );
//remove all account entries
- for( QStringList::Iterator it = oldList.begin(); it != oldList.end(); ++it )
+ for( TQStringList::Iterator it = oldList.begin(); it != oldList.end(); ++it )
{
config->deleteGroup( *it );
}
//write a list with all account names into the config
- QStringList accounts; //list of all account names
+ TQStringList accounts; //list of all account names
AccountSetupItem* item = NULL;
int index = 0;
@@ -143,7 +143,7 @@ void ConfigAccounts::defaults()
void ConfigAccounts::slotChanged( )
{
- KCModule::changed();
+ TDECModule::changed();
}
void ConfigAccounts::slotAdd( )
diff --git a/kshowmail/kcmconfigs/configaccounts.h b/kshowmail/kcmconfigs/configaccounts.h
index e2f4e53..047c262 100644
--- a/kshowmail/kcmconfigs/configaccounts.h
+++ b/kshowmail/kcmconfigs/configaccounts.h
@@ -12,18 +12,18 @@
#ifndef CONFIGACCOUNTS_H
#define CONFIGACCOUNTS_H
-//Qt headers
-#include <qlayout.h>
+//TQt headers
+#include <ntqlayout.h>
//KDE headers
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klistview.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdelistview.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
//kshowmail headers
#include "../constants.h"
@@ -34,7 +34,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure the accounts.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigAccounts : public KCModule
+class ConfigAccounts : public TDECModule
{
Q_OBJECT
@@ -43,7 +43,7 @@ Q_OBJECT
/**
* Generic Constructor
*/
- ConfigAccounts( QWidget *parent = 0, const char *name = 0, const QStringList &args = QStringList() );
+ ConfigAccounts( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -51,21 +51,21 @@ Q_OBJECT
~ConfigAccounts();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -77,12 +77,12 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Account List View
*/
- KListView* AccountListView;
+ TDEListView* AccountListView;
/**
* Button to add a new account
@@ -103,7 +103,7 @@ Q_OBJECT
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
diff --git a/kshowmail/kcmconfigs/configactions.cpp b/kshowmail/kcmconfigs/configactions.cpp
index 583d767..11cacd6 100644
--- a/kshowmail/kcmconfigs/configactions.cpp
+++ b/kshowmail/kcmconfigs/configactions.cpp
@@ -11,13 +11,13 @@
//
#include "configactions.h"
-typedef KGenericFactory<ConfigActions, QWidget> ConfigActionsFactory;
+typedef KGenericFactory<ConfigActions, TQWidget> ConfigActionsFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfigactions, ConfigActionsFactory(
"kcm_kshowmailconfigactions" ) );
-ConfigActions::ConfigActions( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigActionsFactory::instance(), parent, args )
+ConfigActions::ConfigActions( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigActionsFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -27,65 +27,65 @@ ConfigActions::ConfigActions( QWidget * parent, const char * name, const QString
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//two boxes to seperate the action if new mail or if no new mail
- QGroupBox* gboxNewMails = new QGroupBox( 0, Qt::Horizontal, i18n( "Action if new &mail" ), this, "gboxNewMails" );
- QGroupBox* gboxNoNewMails = new QGroupBox( 2, Qt::Vertical, i18n( "Action if &no mail" ), this, "gboxNoNewMails" );
+ TQGroupBox* gboxNewMails = new TQGroupBox( 0, TQt::Horizontal, i18n( "Action if new &mail" ), this, "gboxNewMails" );
+ TQGroupBox* gboxNoNewMails = new TQGroupBox( 2, TQt::Vertical, i18n( "Action if &no mail" ), this, "gboxNoNewMails" );
gboxNoNewMails->layout()->setSpacing( 20 );
layMain->addWidget( gboxNewMails );
layMain->addWidget( gboxNoNewMails );
//layouts for the upper group box
- QVBoxLayout* layMainNewMails = new QVBoxLayout( gboxNewMails->layout(), 10 );
- QGridLayout* layMainNewMailsTop = new QGridLayout( layMainNewMails, 2, 2, 10 );
- QGridLayout* layMainNewMailsDown = new QGridLayout( layMainNewMails, 2, 4, 10 );
+ TQVBoxLayout* layMainNewMails = new TQVBoxLayout( gboxNewMails->layout(), 10 );
+ TQGridLayout* layMainNewMailsTop = new TQGridLayout( layMainNewMails, 2, 2, 10 );
+ TQGridLayout* layMainNewMailsDown = new TQGridLayout( layMainNewMails, 2, 4, 10 );
//items for the upper group box
- chkNewMailsAlertWindow = new QCheckBox( i18n( "Show message box" ), gboxNewMails, "chkNewMailsAlertWindow" );
- QToolTip::add( chkNewMailsAlertWindow, i18n( "Show message if new mail arrives" ) );
+ chkNewMailsAlertWindow = new TQCheckBox( i18n( "Show message box" ), gboxNewMails, "chkNewMailsAlertWindow" );
+ TQToolTip::add( chkNewMailsAlertWindow, i18n( "Show message if new mail arrives" ) );
layMainNewMailsTop->addWidget( chkNewMailsAlertWindow, 0, 0 );
- chkNewMailsMainWindow = new QCheckBox( i18n( "Show main window" ), gboxNewMails, "chkNewMailsMainWindow" );
- QToolTip::add( chkNewMailsMainWindow, i18n( "Show main window if new mail arrives" ) );
+ chkNewMailsMainWindow = new TQCheckBox( i18n( "Show main window" ), gboxNewMails, "chkNewMailsMainWindow" );
+ TQToolTip::add( chkNewMailsMainWindow, i18n( "Show main window if new mail arrives" ) );
layMainNewMailsTop->addWidget( chkNewMailsMainWindow, 0, 1 );
- chkNewMailsBeep = new QCheckBox( i18n( "&Beep" ), gboxNewMails, "chkNewMailsBeep" );
- QToolTip::add( chkNewMailsBeep, i18n( "Beeps the internal speaker if new mail" ) );
+ chkNewMailsBeep = new TQCheckBox( i18n( "&Beep" ), gboxNewMails, "chkNewMailsBeep" );
+ TQToolTip::add( chkNewMailsBeep, i18n( "Beeps the internal speaker if new mail" ) );
layMainNewMailsTop->addWidget( chkNewMailsBeep, 1, 0 );
- chkNewMailsSound = new QCheckBox( i18n( "Sound:" ), gboxNewMails, "chkNewMailsSound" );
- QToolTip::add( chkNewMailsSound, i18n( "Plays sound if new mail" ) );
+ chkNewMailsSound = new TQCheckBox( i18n( "Sound:" ), gboxNewMails, "chkNewMailsSound" );
+ TQToolTip::add( chkNewMailsSound, i18n( "Plays sound if new mail" ) );
layMainNewMailsDown->addWidget( chkNewMailsSound, 0, 0 );
- btnNewMailsPlaySound = new KPushButton( KGuiItem( QString(), QString( "player_play" ), i18n( "Play the selected sound file" ), i18n( "Play the selected sound file" ) ), gboxNewMails, "btnNewMailsPlaySound" );
+ btnNewMailsPlaySound = new KPushButton( KGuiItem( TQString(), TQString( "player_play" ), i18n( "Play the selected sound file" ), i18n( "Play the selected sound file" ) ), gboxNewMails, "btnNewMailsPlaySound" );
layMainNewMailsDown->addWidget( btnNewMailsPlaySound, 0, 1 );
txtNewMailsSound = new KLineEdit( gboxNewMails, "txtNewMailsSound" );
layMainNewMailsDown->addWidget( txtNewMailsSound, 0, 2 );
- btnNewMailsChooseSound = new KPushButton( KGuiItem( QString(), QString( "folder" ), i18n( "Press to select sound file" ), i18n( "Press to select sound file" ) ), gboxNewMails, "btnNewMailsChooseSound" );
+ btnNewMailsChooseSound = new KPushButton( KGuiItem( TQString(), TQString( "folder" ), i18n( "Press to select sound file" ), i18n( "Press to select sound file" ) ), gboxNewMails, "btnNewMailsChooseSound" );
layMainNewMailsDown->addWidget( btnNewMailsChooseSound, 0, 3 );
- chkNewMailsCommand = new QCheckBox( i18n( "Command:" ), gboxNewMails, "chkNewMailsCommand" );
- QToolTip::add( chkNewMailsCommand, i18n( "Starts external program if new mail" ) );
+ chkNewMailsCommand = new TQCheckBox( i18n( "Command:" ), gboxNewMails, "chkNewMailsCommand" );
+ TQToolTip::add( chkNewMailsCommand, i18n( "Starts external program if new mail" ) );
layMainNewMailsDown->addWidget( chkNewMailsCommand, 1, 0 );
- btnNewMailsExecCommand = new KPushButton( KGuiItem( QString(), QString( "exec" ), i18n( "Start the selected program" ), i18n( "Start the selected program" ) ), gboxNewMails, "btnNewMailsExecCommand" );
+ btnNewMailsExecCommand = new KPushButton( KGuiItem( TQString(), TQString( "exec" ), i18n( "Start the selected program" ), i18n( "Start the selected program" ) ), gboxNewMails, "btnNewMailsExecCommand" );
layMainNewMailsDown->addWidget( btnNewMailsExecCommand, 1, 1 );
txtNewMailsCommand = new KLineEdit( gboxNewMails, "txtNewMailsCommand" );
layMainNewMailsDown->addWidget( txtNewMailsCommand, 1, 2 );
- btnNewMailsChooseCommand = new KPushButton( KGuiItem( QString(), QString( "folder" ), i18n( "Select external command" ), i18n( "Select external command" ) ), gboxNewMails, "btnNewMailsChooseCommand" );
+ btnNewMailsChooseCommand = new KPushButton( KGuiItem( TQString(), TQString( "folder" ), i18n( "Select external command" ), i18n( "Select external command" ) ), gboxNewMails, "btnNewMailsChooseCommand" );
layMainNewMailsDown->addWidget( btnNewMailsChooseCommand, 1, 3 );
//items for the lower group box
- chkNoNewMailsMinimize = new QCheckBox( i18n( "Minimi&ze" ), gboxNoNewMails, "chkNoNewMailsMinimize" );
- QToolTip::add( chkNoNewMailsMinimize, i18n( "Minimize window if no new mail" ) );
+ chkNoNewMailsMinimize = new TQCheckBox( i18n( "Minimi&ze" ), gboxNoNewMails, "chkNoNewMailsMinimize" );
+ TQToolTip::add( chkNoNewMailsMinimize, i18n( "Minimize window if no new mail" ) );
- chkNoNewMailsTerminate = new QCheckBox( i18n( "Terminate" ), gboxNoNewMails, "chkNoNewMailsTerminate" );
- QToolTip::add( chkNoNewMailsTerminate, i18n( "Terminate kshowmail if no new mail" ) );
+ chkNoNewMailsTerminate = new TQCheckBox( i18n( "Terminate" ), gboxNoNewMails, "chkNoNewMailsTerminate" );
+ TQToolTip::add( chkNoNewMailsTerminate, i18n( "Terminate kshowmail if no new mail" ) );
//connect file choose buttons
connect( btnNewMailsChooseSound, SIGNAL( clicked() ), this, SLOT( slotChooseSound() ) );
@@ -105,15 +105,15 @@ ConfigActions::ConfigActions( QWidget * parent, const char * name, const QString
connect( chkNewMailsBeep, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
connect( chkNewMailsSound, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
connect( chkNewMailsCommand, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
- connect( txtNewMailsSound, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotChanged() ) );
- connect( txtNewMailsCommand, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotChanged() ) );
+ connect( txtNewMailsSound, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotChanged() ) );
+ connect( txtNewMailsCommand, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotChanged() ) );
connect( chkNoNewMailsMinimize, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
connect( chkNoNewMailsTerminate, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configured values
load();
@@ -179,57 +179,57 @@ void ConfigActions::save( )
void ConfigActions::slotChooseSound( )
{
- QString startPath; //start path of the file dialog
+ TQString startPath; //start path of the file dialog
//get sounds directory of kshowmail
- KStandardDirs stdDirs;
- QString soundPath = stdDirs.findResource( "data", "kshowmail/sounds/" );
+ TDEStandardDirs stdDirs;
+ TQString soundPath = stdDirs.findResource( "data", "kshowmail/sounds/" );
//get start path of the file dialog
if( txtNewMailsSound->text() != "" )
{
startPath = txtNewMailsSound->text();
}
- else if( soundPath != QString::null )
+ else if( soundPath != TQString::null )
{
startPath = soundPath;
}
else
{
- startPath = QString::null;
+ startPath = TQString::null;
}
//open file dialog
- QString path = KFileDialog::getOpenFileName( startPath, "*.wav *.ogg|" + i18n( "Sound files (*.wav, *.ogg)" ) + "\n*.*|" + i18n( "All files (*)" ), this, i18n("Select Sound File") );
+ TQString path = KFileDialog::getOpenFileName( startPath, "*.wav *.ogg|" + i18n( "Sound files (*.wav, *.ogg)" ) + "\n*.*|" + i18n( "All files (*)" ), this, i18n("Select Sound File") );
//write selected path into the edit line
- if( path != QString::null )
+ if( path != TQString::null )
txtNewMailsSound->setText( path );
}
void ConfigActions::slotChooseCommand( )
{
//open file dialog
- QString path = KFileDialog::getOpenFileName( QString::null, "", this, i18n("Select external command") );
+ TQString path = KFileDialog::getOpenFileName( TQString::null, "", this, i18n("Select external command") );
//write selected path into the edit line
- if( path != QString::null )
+ if( path != TQString::null )
txtNewMailsCommand->setText( path );
}
void ConfigActions::slotPlaySound( )
{
- QString path = txtNewMailsSound->text();
+ TQString path = txtNewMailsSound->text();
- if( path != QString::null )
+ if( path != TQString::null )
KAudioPlayer::play( path );
}
void ConfigActions::slotExecuteCommand( )
{
- QString path = txtNewMailsCommand->text();
+ TQString path = txtNewMailsCommand->text();
- if( path != QString::null )
+ if( path != TQString::null )
{
KShellProcess proc; //process handler to execute the binary
@@ -255,7 +255,7 @@ void ConfigActions::slotCommandToggled( bool on )
void ConfigActions::slotChanged( )
{
- KCModule::changed();
+ TDECModule::changed();
}
diff --git a/kshowmail/kcmconfigs/configactions.h b/kshowmail/kcmconfigs/configactions.h
index 901984f..927f121 100644
--- a/kshowmail/kcmconfigs/configactions.h
+++ b/kshowmail/kcmconfigs/configactions.h
@@ -15,22 +15,22 @@
#include <string.h>
//QT headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qtooltip.h>
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqcheckbox.h>
+#include <ntqtooltip.h>
//KDE headers
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kgenericfactory.h>
#include <kpushbutton.h>
#include <klineedit.h>
#include <kdebug.h>
-#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdeapplication.h>
+#include <tdefiledialog.h>
#include <kaudioplayer.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
//kshowmail headers
@@ -41,7 +41,7 @@
*
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigActions : public KCModule
+class ConfigActions : public TDECModule
{
Q_OBJECT
@@ -49,7 +49,7 @@ Q_OBJECT
/**
* Generic Constructor
*/
- ConfigActions( QWidget *parent = 0, const char *name = 0, const QStringList &args = QStringList() );
+ ConfigActions( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -57,21 +57,21 @@ Q_OBJECT
~ConfigActions();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -83,32 +83,32 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Check box to select whether an alert message will be shown if a new mail is arrived.
*/
- QCheckBox* chkNewMailsAlertWindow;
+ TQCheckBox* chkNewMailsAlertWindow;
/**
* Check box to select whether the main window will be shown if a new mail is arrived.
*/
- QCheckBox* chkNewMailsMainWindow;
+ TQCheckBox* chkNewMailsMainWindow;
/**
* Check box to select whether the system beep will be played if a new mail is arrived.
*/
- QCheckBox* chkNewMailsBeep;
+ TQCheckBox* chkNewMailsBeep;
/**
* Check box to select whether a sound will be played if a new mail is arrived.
*/
- QCheckBox* chkNewMailsSound;
+ TQCheckBox* chkNewMailsSound;
/**
* Check box to select whether a command will be executed if a new mail is arrived.
*/
- QCheckBox* chkNewMailsCommand;
+ TQCheckBox* chkNewMailsCommand;
/**
* Button to test the sound which will be played if a new mail is arrived.
@@ -143,12 +143,12 @@ Q_OBJECT
/**
* Check box to select whether the main window will be minimized if no new mail is arrived.
*/
- QCheckBox* chkNoNewMailsMinimize;
+ TQCheckBox* chkNoNewMailsMinimize;
/**
* Check box to select whether the application will be terminated if no new mail is arrived.
*/
- QCheckBox* chkNoNewMailsTerminate;
+ TQCheckBox* chkNoNewMailsTerminate;
private slots:
@@ -194,7 +194,7 @@ Q_OBJECT
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
};
diff --git a/kshowmail/kcmconfigs/configdisplay.cpp b/kshowmail/kcmconfigs/configdisplay.cpp
index e93027c..4aa22d5 100644
--- a/kshowmail/kcmconfigs/configdisplay.cpp
+++ b/kshowmail/kcmconfigs/configdisplay.cpp
@@ -11,13 +11,13 @@
//
#include "configdisplay.h"
-typedef KGenericFactory<ConfigDisplay, QWidget> ConfigDisplayFactory;
+typedef KGenericFactory<ConfigDisplay, TQWidget> ConfigDisplayFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfigdisplay, ConfigDisplayFactory(
"kcm_kshowmailconfigdisplay" ) );
-ConfigDisplay::ConfigDisplay( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigDisplayFactory::instance(), parent, args )
+ConfigDisplay::ConfigDisplay( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigDisplayFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -27,84 +27,84 @@ ConfigDisplay::ConfigDisplay( QWidget * parent, const char * name, const QString
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//group boxes
- QGroupBox* gboxAccountlist = new QGroupBox( 0, Qt::Horizontal, i18n( "Account list" ), this, "gboxAccountlist" );
+ TQGroupBox* gboxAccountlist = new TQGroupBox( 0, TQt::Horizontal, i18n( "Account list" ), this, "gboxAccountlist" );
layMain->addWidget( gboxAccountlist );
- QGroupBox* gboxMessagelist = new QGroupBox( 0, Qt::Horizontal, i18n( "Mail list" ), this, "gboxMessagelist" );
+ TQGroupBox* gboxMessagelist = new TQGroupBox( 0, TQt::Horizontal, i18n( "Mail list" ), this, "gboxMessagelist" );
layMain->addWidget( gboxMessagelist );
- QGroupBox* gboxMessageContent = new QGroupBox( 0, Qt::Horizontal, i18n( "Mail content" ), this, "gboxMessageContent" );
+ TQGroupBox* gboxMessageContent = new TQGroupBox( 0, TQt::Horizontal, i18n( "Mail content" ), this, "gboxMessageContent" );
layMain->addWidget( gboxMessageContent );
//group box layouts
- QGridLayout* layAccountlist = new QGridLayout( gboxAccountlist->layout(), 3, 2, 10 );
- QGridLayout* layMessagelist = new QGridLayout( gboxMessagelist->layout(), 5, 2, 10 );
- QGridLayout* layMessageContent = new QGridLayout( gboxMessageContent->layout(), 1, 1, 10 );
+ TQGridLayout* layAccountlist = new TQGridLayout( gboxAccountlist->layout(), 3, 2, 10 );
+ TQGridLayout* layMessagelist = new TQGridLayout( gboxMessagelist->layout(), 5, 2, 10 );
+ TQGridLayout* layMessageContent = new TQGridLayout( gboxMessageContent->layout(), 1, 1, 10 );
//create items
- chkAccountlistActive = new QCheckBox( i18n( "Active" ), gboxAccountlist, "chkAccountlistActive" );
- QToolTip::add( chkAccountlistActive, i18n( "To switch on/off the 'Active' column in the account list" ) );
+ chkAccountlistActive = new TQCheckBox( i18n( "Active" ), gboxAccountlist, "chkAccountlistActive" );
+ TQToolTip::add( chkAccountlistActive, i18n( "To switch on/off the 'Active' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistActive, 0, 0 );
- chkAccountlistAccount = new QCheckBox( i18n( "Account" ), gboxAccountlist, "chkAccountlistAccount" );
- QToolTip::add( chkAccountlistAccount, i18n( "To switch on/off the 'Account' column in the account list" ) );
+ chkAccountlistAccount = new TQCheckBox( i18n( "Account" ), gboxAccountlist, "chkAccountlistAccount" );
+ TQToolTip::add( chkAccountlistAccount, i18n( "To switch on/off the 'Account' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistAccount, 0, 1 );
- chkAccountlistServer = new QCheckBox( i18n( "Server" ), gboxAccountlist, "chkAccountlistServer" );
- QToolTip::add( chkAccountlistServer, i18n( "To switch on/off the 'Server' column in the account list" ) );
+ chkAccountlistServer = new TQCheckBox( i18n( "Server" ), gboxAccountlist, "chkAccountlistServer" );
+ TQToolTip::add( chkAccountlistServer, i18n( "To switch on/off the 'Server' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistServer, 1, 0 );
- chkAccountlistUser = new QCheckBox( i18n( "User" ), gboxAccountlist, "chkAccountlistUser" );
- QToolTip::add( chkAccountlistUser, i18n( "To switch on/off the 'User' column in the account list" ) );
+ chkAccountlistUser = new TQCheckBox( i18n( "User" ), gboxAccountlist, "chkAccountlistUser" );
+ TQToolTip::add( chkAccountlistUser, i18n( "To switch on/off the 'User' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistUser, 1, 1 );
- chkAccountlistMessages = new QCheckBox( i18n( "Messages" ), gboxAccountlist, "chkAccountlistMessages" );
- QToolTip::add( chkAccountlistMessages, i18n( "To switch on/off the 'Messages' column in the account list" ) );
+ chkAccountlistMessages = new TQCheckBox( i18n( "Messages" ), gboxAccountlist, "chkAccountlistMessages" );
+ TQToolTip::add( chkAccountlistMessages, i18n( "To switch on/off the 'Messages' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistMessages, 2, 0 );
- chkAccountlistSize = new QCheckBox( i18n( "Si&ze" ), gboxAccountlist, "chkAccountlistSize" );
- QToolTip::add( chkAccountlistSize, i18n( "To switch on/off the 'Size' column in the account list" ) );
+ chkAccountlistSize = new TQCheckBox( i18n( "Si&ze" ), gboxAccountlist, "chkAccountlistSize" );
+ TQToolTip::add( chkAccountlistSize, i18n( "To switch on/off the 'Size' column in the account list" ) );
layAccountlist->addWidget( chkAccountlistSize, 2, 1 );
- chkMessagelistNumber = new QCheckBox( i18n( "Number" ), gboxMessagelist, "chkMessagelistNumber" );
- QToolTip::add( chkMessagelistNumber, i18n( "To switch on/off the 'Number' column in the message list" ) );
+ chkMessagelistNumber = new TQCheckBox( i18n( "Number" ), gboxMessagelist, "chkMessagelistNumber" );
+ TQToolTip::add( chkMessagelistNumber, i18n( "To switch on/off the 'Number' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistNumber, 0, 0 );
- chkMessagelistAccount = new QCheckBox( i18n( "Account" ), gboxMessagelist, "chkMessagelistAccount" );
- QToolTip::add( chkMessagelistAccount, i18n( "To switch on/off the 'Account' column in the message list" ) );
+ chkMessagelistAccount = new TQCheckBox( i18n( "Account" ), gboxMessagelist, "chkMessagelistAccount" );
+ TQToolTip::add( chkMessagelistAccount, i18n( "To switch on/off the 'Account' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistAccount, 0, 1 );
- chkMessagelistFrom = new QCheckBox( i18n( "From" ), gboxMessagelist, "chkMessagelistFrom" );
- QToolTip::add( chkMessagelistFrom, i18n( "To switch on/off the 'From' column in the message list" ) );
+ chkMessagelistFrom = new TQCheckBox( i18n( "From" ), gboxMessagelist, "chkMessagelistFrom" );
+ TQToolTip::add( chkMessagelistFrom, i18n( "To switch on/off the 'From' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistFrom, 1, 0 );
- chkMessagelistTo = new QCheckBox( i18n( "To" ), gboxMessagelist, "chkMessagelistTo" );
- QToolTip::add( chkMessagelistTo, i18n( "To switch on/off the 'To' column in the message list" ) );
+ chkMessagelistTo = new TQCheckBox( i18n( "To" ), gboxMessagelist, "chkMessagelistTo" );
+ TQToolTip::add( chkMessagelistTo, i18n( "To switch on/off the 'To' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistTo, 1, 1 );
- chkMessagelistSubject = new QCheckBox( i18n( "Su&bject" ), gboxMessagelist, "chkMessagelistSubject" );
- QToolTip::add( chkMessagelistSubject, i18n( "To switch on/off the 'Subject' column in the message list" ) );
+ chkMessagelistSubject = new TQCheckBox( i18n( "Su&bject" ), gboxMessagelist, "chkMessagelistSubject" );
+ TQToolTip::add( chkMessagelistSubject, i18n( "To switch on/off the 'Subject' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistSubject, 2, 0 );
- chkMessagelistDate = new QCheckBox( i18n( "Date" ), gboxMessagelist, "chkMessagelistDate" );
- QToolTip::add( chkMessagelistDate, i18n( "To switch on/off the 'Date' column in the message list" ) );
+ chkMessagelistDate = new TQCheckBox( i18n( "Date" ), gboxMessagelist, "chkMessagelistDate" );
+ TQToolTip::add( chkMessagelistDate, i18n( "To switch on/off the 'Date' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistDate, 2, 1 );
- chkMessagelistSize = new QCheckBox( i18n( "Size" ), gboxMessagelist, "chkMessagelistSize" );
- QToolTip::add( chkMessagelistSize, i18n( "To switch on/off the 'Size' column in the message list" ) );
+ chkMessagelistSize = new TQCheckBox( i18n( "Size" ), gboxMessagelist, "chkMessagelistSize" );
+ TQToolTip::add( chkMessagelistSize, i18n( "To switch on/off the 'Size' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistSize, 3, 0 );
- chkMessagelistContent = new QCheckBox( i18n( "Content" ), gboxMessagelist, "chkMessagelistContent" );
- QToolTip::add( chkMessagelistContent, i18n( "To switch on/off the 'Content' column in the message list" ) );
+ chkMessagelistContent = new TQCheckBox( i18n( "Content" ), gboxMessagelist, "chkMessagelistContent" );
+ TQToolTip::add( chkMessagelistContent, i18n( "To switch on/off the 'Content' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistContent, 3, 1 );
- chkMessagelistState = new QCheckBox( i18n( "State" ), gboxMessagelist, "chkMessagelistState" );
- QToolTip::add( chkMessagelistState, i18n( "To switch on/off the 'State' column in the message list" ) );
+ chkMessagelistState = new TQCheckBox( i18n( "State" ), gboxMessagelist, "chkMessagelistState" );
+ TQToolTip::add( chkMessagelistState, i18n( "To switch on/off the 'State' column in the message list" ) );
layMessagelist->addWidget( chkMessagelistState, 4, 0 );
- chkAllowHTML = new QCheckBox( i18n( "Allow HTML" ), gboxMessageContent, "chkAllowHTML" );
- QToolTip::add( chkAllowHTML, i18n( "To switch on/off HTML in the message view") );
+ chkAllowHTML = new TQCheckBox( i18n( "Allow HTML" ), gboxMessageContent, "chkAllowHTML" );
+ TQToolTip::add( chkAllowHTML, i18n( "To switch on/off HTML in the message view") );
layMessageContent->addWidget( chkAllowHTML, 0, 0 );
//connect all configuration itmes with slot changed() to notify the dialog about changes
@@ -127,7 +127,7 @@ ConfigDisplay::ConfigDisplay( QWidget * parent, const char * name, const QString
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configurated values
load();
@@ -139,7 +139,7 @@ ConfigDisplay::~ConfigDisplay()
void ConfigDisplay::slotChanged( )
{
- KCModule::changed();
+ TDECModule::changed();
}
void ConfigDisplay::load( )
diff --git a/kshowmail/kcmconfigs/configdisplay.h b/kshowmail/kcmconfigs/configdisplay.h
index 847b20b..1404681 100644
--- a/kshowmail/kcmconfigs/configdisplay.h
+++ b/kshowmail/kcmconfigs/configdisplay.h
@@ -12,18 +12,18 @@
#ifndef CONFIGDISPLAY_H
#define CONFIGDISPLAY_H
-//Qt headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qtooltip.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqcheckbox.h>
+#include <ntqlabel.h>
+#include <ntqtooltip.h>
//KDE headers
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
//KShowmail headers
#include <../constants.h>
@@ -33,7 +33,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure the display.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigDisplay : public KCModule
+class ConfigDisplay : public TDECModule
{
Q_OBJECT
@@ -41,7 +41,7 @@ Q_OBJECT
/**
* Generic Constructor
*/
- ConfigDisplay( QWidget *parent = 0, const char *name = 0, const QStringList &args = QStringList() );
+ ConfigDisplay( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -49,21 +49,21 @@ Q_OBJECT
~ConfigDisplay();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -75,93 +75,93 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Check box to switch on/off the "Active" column in the account list.
*/
- QCheckBox* chkAccountlistActive;
+ TQCheckBox* chkAccountlistActive;
/**
* Check box to switch on/off the "Account" column in the account list.
*/
- QCheckBox* chkAccountlistAccount;
+ TQCheckBox* chkAccountlistAccount;
/**
* Check box to switch on/off the "Server" column in the account list.
*/
- QCheckBox* chkAccountlistServer;
+ TQCheckBox* chkAccountlistServer;
/**
* Check box to switch on/off the "User" column in the account list.
*/
- QCheckBox* chkAccountlistUser;
+ TQCheckBox* chkAccountlistUser;
/**
* Check box to switch on/off the "Messages" column in the account list.
*/
- QCheckBox* chkAccountlistMessages;
+ TQCheckBox* chkAccountlistMessages;
/**
* Check box to switch on/off the "Size" column in the account list.
*/
- QCheckBox* chkAccountlistSize;
+ TQCheckBox* chkAccountlistSize;
/**
* Check box to switch on/off the "Number" column in the message list.
*/
- QCheckBox* chkMessagelistNumber;
+ TQCheckBox* chkMessagelistNumber;
/**
* Check box to switch on/off the "Account" column in the message list.
*/
- QCheckBox* chkMessagelistAccount;
+ TQCheckBox* chkMessagelistAccount;
/**
* Check box to switch on/off the "From" column in the message list.
*/
- QCheckBox* chkMessagelistFrom;
+ TQCheckBox* chkMessagelistFrom;
/**
* Check box to switch on/off the "To" column in the message list.
*/
- QCheckBox* chkMessagelistTo;
+ TQCheckBox* chkMessagelistTo;
/**
* Check box to switch on/off the "Subject" column in the message list.
*/
- QCheckBox* chkMessagelistSubject;
+ TQCheckBox* chkMessagelistSubject;
/**
* Check box to switch on/off the "Date" column in the message list.
*/
- QCheckBox* chkMessagelistDate;
+ TQCheckBox* chkMessagelistDate;
/**
* Check box to switch on/off the "Size" column in the message list.
*/
- QCheckBox* chkMessagelistSize;
+ TQCheckBox* chkMessagelistSize;
/**
* Check box to switch on/off the "Content" column in the message list.
*/
- QCheckBox* chkMessagelistContent;
+ TQCheckBox* chkMessagelistContent;
/**
* Check box to switch on/off the "State" column in the message list.
*/
- QCheckBox* chkMessagelistState;
+ TQCheckBox* chkMessagelistState;
/**
* Check box to switch on/off HTML in the message view.
*/
- QCheckBox* chkAllowHTML;
+ TQCheckBox* chkAllowHTML;
public slots:
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
};
diff --git a/kshowmail/kcmconfigs/configfilter.cpp b/kshowmail/kcmconfigs/configfilter.cpp
index c999361..a5ebdb7 100644
--- a/kshowmail/kcmconfigs/configfilter.cpp
+++ b/kshowmail/kcmconfigs/configfilter.cpp
@@ -11,13 +11,13 @@
//
#include "configfilter.h"
-typedef KGenericFactory<ConfigFilter, QWidget> ConfigFilterFactory;
+typedef KGenericFactory<ConfigFilter, TQWidget> ConfigFilterFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfigfilter, ConfigFilterFactory(
"kcm_kshowmailconfigfilter" ) );
-ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigFilterFactory::instance(), parent, args )
+ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigFilterFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -27,33 +27,33 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//check box to activate the filter
- chkActivateFilter = new QCheckBox( i18n( "Activate Filter" ), this, "chkActivateFilter" );
+ chkActivateFilter = new TQCheckBox( i18n( "Activate Filter" ), this, "chkActivateFilter" );
layMain->addWidget( chkActivateFilter );
- QToolTip::add( chkActivateFilter, i18n( "Check to activate the header filter." ) );
+ TQToolTip::add( chkActivateFilter, i18n( "Check to activate the header filter." ) );
connect( chkActivateFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotFilterActiveToggled( bool ) ) );
connect( chkActivateFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
//GUI of sender lists
//-------------------
- gboxSenderLists = new QGroupBox( 0, Qt::Horizontal, i18n( "First Check: Sender Lists" ), this, "gboxSenderLists" );
- QHBoxLayout* laySender = new QHBoxLayout( gboxSenderLists->layout(), 10 );
+ gboxSenderLists = new TQGroupBox( 0, TQt::Horizontal, i18n( "First Check: Sender Lists" ), this, "gboxSenderLists" );
+ TQHBoxLayout* laySender = new TQHBoxLayout( gboxSenderLists->layout(), 10 );
layMain->addWidget( gboxSenderLists );
- btnOpenWhitelist = new KPushButton( KGuiItem( QString( i18n( "Whitelist") ), QString( "mail_forward" ) ), gboxSenderLists, "btnOpenWhitelist" );
- QToolTip::add( btnOpenWhitelist, i18n( "Click here to edit the list of senders whose mails shall pass the filter." ) );
+ btnOpenWhitelist = new KPushButton( KGuiItem( TQString( i18n( "Whitelist") ), TQString( "mail_forward" ) ), gboxSenderLists, "btnOpenWhitelist" );
+ TQToolTip::add( btnOpenWhitelist, i18n( "Click here to edit the list of senders whose mails shall pass the filter." ) );
laySender->addWidget( btnOpenWhitelist );
laySender->setStretchFactor( btnOpenWhitelist, 3 );
- btnOpenWhitelist->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+ btnOpenWhitelist->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
connect( btnOpenWhitelist, SIGNAL( clicked() ), this, SLOT( slotOpenWhitelist() ) );
- btnOpenBlacklist = new KPushButton( KGuiItem( QString( i18n( "Blacklist" ) ), QString( "mail_delete" ) ), gboxSenderLists, "btnOpenBlacklist" );
- QToolTip::add( btnOpenBlacklist, i18n( "Click here to edit the list of senders whose mails shall be deleted or marked." ) );
+ btnOpenBlacklist = new KPushButton( KGuiItem( TQString( i18n( "Blacklist" ) ), TQString( "mail_delete" ) ), gboxSenderLists, "btnOpenBlacklist" );
+ TQToolTip::add( btnOpenBlacklist, i18n( "Click here to edit the list of senders whose mails shall be deleted or marked." ) );
laySender->addWidget( btnOpenBlacklist );
laySender->setStretchFactor( btnOpenBlacklist, 3 );
- btnOpenBlacklist->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+ btnOpenBlacklist->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
connect( btnOpenBlacklist, SIGNAL( clicked() ), this, SLOT( slotOpenBlacklist() ) );
laySender->insertStretch( 0, 2 );
@@ -62,24 +62,24 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
//GUI of filters
//--------------
- gboxFilters = new QGroupBox( 0, Qt::Horizontal, i18n( "Second Check: Filters" ), this, "gboxFilters" );
- QHBoxLayout* layFilters = new QHBoxLayout( gboxFilters->layout(), 10 );
+ gboxFilters = new TQGroupBox( 0, TQt::Horizontal, i18n( "Second Check: Filters" ), this, "gboxFilters" );
+ TQHBoxLayout* layFilters = new TQHBoxLayout( gboxFilters->layout(), 10 );
layMain->addWidget( gboxFilters );
- listFilters = new KListView( gboxFilters, "listFilters" );
+ listFilters = new TDEListView( gboxFilters, "listFilters" );
listFilters->addColumn( i18n( "No." ) );
listFilters->addColumn( i18n( "Name" ) );
listFilters->addColumn( i18n( "Action" ) );
layFilters->addWidget( listFilters );
- listFilters->setColumnWidthMode( 0, QListView::Maximum );
- listFilters->setColumnWidthMode( 1, QListView::Maximum );
- listFilters->setColumnWidthMode( 2, QListView::Maximum );
- listFilters->setResizeMode( QListView::LastColumn );
- listFilters->setColumnAlignment( 0, Qt::AlignHCenter );
+ listFilters->setColumnWidthMode( 0, TQListView::Maximum );
+ listFilters->setColumnWidthMode( 1, TQListView::Maximum );
+ listFilters->setColumnWidthMode( 2, TQListView::Maximum );
+ listFilters->setResizeMode( TQListView::LastColumn );
+ listFilters->setColumnAlignment( 0, TQt::AlignHCenter );
listFilters->setSorting( 0 ); //the list is sorted by filter number
listFilters->setAllColumnsShowFocus( true );
- QVBoxLayout* layFiltersButtons = new QVBoxLayout( layFilters, 10 );
+ TQVBoxLayout* layFiltersButtons = new TQVBoxLayout( layFilters, 10 );
btnAdd = new KPushButton( KStdGuiItem::add(), gboxFilters, "btnAdd" );
btnEdit = new KPushButton( KStdGuiItem::configure(), gboxFilters, "btnEdit" );
btnRemove = new KPushButton( KStdGuiItem::remove(), gboxFilters, "btnRemove" );
@@ -87,17 +87,17 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
btnMoveUp = new KPushButton( KGuiItem( "", "up", i18n( "Moves the selected filter up" ) ), gboxFilters, "btnMoveUp" );
btnMoveDown = new KPushButton( KGuiItem( "", "down", i18n( "Moves the selected filter down" ) ), gboxFilters, "btnMoveDown" );
btnMoveBottom = new KPushButton( KGuiItem( "", "bottom", i18n( "Moves the selected filter at the bottm" ) ), gboxFilters, "btnMoveBottom" );
- btnAdd->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnEdit->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnRemove->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnMoveTop->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnMoveUp->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnMoveDown->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- btnMoveBottom->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+ btnAdd->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnEdit->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnRemove->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnMoveTop->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnMoveUp->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnMoveDown->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+ btnMoveBottom->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
layFiltersButtons->addWidget( btnAdd );
layFiltersButtons->addWidget( btnEdit );
layFiltersButtons->addWidget( btnRemove );
- layFiltersButtons->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+ layFiltersButtons->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
layFiltersButtons->addWidget( btnMoveTop );
layFiltersButtons->addWidget( btnMoveUp );
layFiltersButtons->addWidget( btnMoveDown );
@@ -113,14 +113,14 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
//GUI of Others
//-------------
- gboxOthers = new QGroupBox( 0, Qt::Horizontal, i18n( "Third Check: Action for all others" ), this, "gboxOthers" );
- QHBoxLayout* layOthers = new QHBoxLayout( gboxOthers->layout(), 10 );
+ gboxOthers = new TQGroupBox( 0, TQt::Horizontal, i18n( "Third Check: Action for all others" ), this, "gboxOthers" );
+ TQHBoxLayout* layOthers = new TQHBoxLayout( gboxOthers->layout(), 10 );
layMain->addWidget( gboxOthers );
//create combobox to select action
cmbActionOthers = new KComboBox( gboxOthers, "cmbActionOthers" );
layOthers->addWidget( cmbActionOthers );
- QToolTip::add( cmbActionOthers, i18n( "Choose the action for all mails which are not filtered by the steps before." ) );
+ TQToolTip::add( cmbActionOthers, i18n( "Choose the action for all mails which are not filtered by the steps before." ) );
connect( cmbActionOthers, SIGNAL( activated( int ) ), this, SLOT( slotOtherActionChanged( int ) ) );
connect( cmbActionOthers, SIGNAL( activated( int ) ), this, SLOT( slotChanged() ) );
@@ -135,12 +135,12 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
//create edit line to defined the mailbox for move
txtMailbox = new KLineEdit( gboxOthers );
layOthers->addWidget( txtMailbox );
- connect( txtMailbox, SIGNAL( textChanged( const QString & ) ), this, SLOT( slotChanged() ) );
+ connect( txtMailbox, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotChanged() ) );
//create wizard button to configure mailbox
- btnMailboxWizard= new KPushButton( KGuiItem( QString::null, "wizard" ), gboxOthers );
+ btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxOthers );
layOthers->addWidget( btnMailboxWizard );
- QToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
+ TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
//set defaults
@@ -160,7 +160,7 @@ ConfigFilter::ConfigFilter( QWidget * parent, const char * name, const QStringLi
slotFilterActiveToggled( DEFAULT_FILTER_ACTIVE );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//init counter for filter item numbering. This variable contains the last assigned number of a filter setup item.
//Because it is initialized with zero, the first filter number is 1.
@@ -233,7 +233,7 @@ void ConfigFilter::defaults( )
}
if( DEFAULT_FILTER_OTHERS_ACTION == CONFIG_VALUE_FILTER_OTHERS_ACTION_MOVE )
- txtMailbox->setText( QString( DEFAULT_FILTER_ACTION_MOVE_MAILBOX ) );
+ txtMailbox->setText( TQString( DEFAULT_FILTER_ACTION_MOVE_MAILBOX ) );
else
txtMailbox->clear();
@@ -283,12 +283,12 @@ void ConfigFilter::save( )
{
for( uint ctr = lastFilterNumber + 1; ctr <= oldNumFilter; ctr++ )
{
- config->deleteGroup( QString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( ctr ) );
+ config->deleteGroup( TQString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( ctr ) );
}
}
//save the filters
- QListViewItemIterator it( listFilters );
+ TQListViewItemIterator it( listFilters );
while( it.current() )
{
@@ -304,7 +304,7 @@ void ConfigFilter::save( )
void ConfigFilter::slotChanged( )
{
- KCModule::changed();
+ TDECModule::changed();
}
void ConfigFilter::slotOpenWhitelist( )
@@ -414,7 +414,7 @@ void ConfigFilter::slotOtherActionChanged( int index )
void ConfigFilter::decreaseNumbers( uint number )
{
//get an iterator of the list view
- QListViewItemIterator it( listFilters );
+ TQListViewItemIterator it( listFilters );
//iterate over the filter list
while( it.current() )
@@ -450,7 +450,7 @@ void ConfigFilter::slotMoveTop( )
decreaseNumbers( num + 1 );
//at last we add one to all numbers
- QListViewItemIterator it( listFilters );
+ TQListViewItemIterator it( listFilters );
while( it.current() )
{
@@ -568,7 +568,7 @@ FilterSetupItem* ConfigFilter::getFilterItem( uint num )
bool found = false;
//get Iterator
- QListViewItemIterator it( listFilters );
+ TQListViewItemIterator it( listFilters );
//iterate over th elist to look for the item
while( it.current() && !found )
@@ -603,7 +603,7 @@ void ConfigFilter::slotOpenMailBoxWizard( )
wizard.setCaption( i18n( "Mailbox Select" ) );
int res = wizard.exec();
- if( res == QDialog::Accepted )
+ if( res == TQDialog::Accepted )
txtMailbox->setText( wizard.getPath() );
}
diff --git a/kshowmail/kcmconfigs/configfilter.h b/kshowmail/kcmconfigs/configfilter.h
index 9d37c82..bcff4ef 100644
--- a/kshowmail/kcmconfigs/configfilter.h
+++ b/kshowmail/kcmconfigs/configfilter.h
@@ -13,17 +13,17 @@
#define CONFIGFILTER_H
//QT headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qtooltip.h>
-#include <qcheckbox.h>
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqtooltip.h>
+#include <ntqcheckbox.h>
//KDE headers
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
-#include <klistview.h>
+#include <tdeapplication.h>
+#include <tdelistview.h>
#include <kpushbutton.h>
#include <kcombobox.h>
#include <klineedit.h>
@@ -47,7 +47,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure the filter.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigFilter : public KCModule
+class ConfigFilter : public TDECModule
{
Q_OBJECT
@@ -56,7 +56,7 @@ Q_OBJECT
/**
* Generic constructor
*/
- ConfigFilter( QWidget* parent = 0, const char* name = 0, const QStringList &args = QStringList() );
+ ConfigFilter( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -64,21 +64,21 @@ Q_OBJECT
~ConfigFilter();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -90,27 +90,27 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Check box to activate the filter
*/
- QCheckBox* chkActivateFilter;
+ TQCheckBox* chkActivateFilter;
/**
* Group box for sender lists.
*/
- QGroupBox* gboxSenderLists;
+ TQGroupBox* gboxSenderLists;
/**
* Group box for filter items.
*/
- QGroupBox* gboxFilters;
+ TQGroupBox* gboxFilters;
/**
* Group box for other action.
*/
- QGroupBox* gboxOthers;
+ TQGroupBox* gboxOthers;
/**
* Button to open the Blacklist.
@@ -125,7 +125,7 @@ Q_OBJECT
/**
* List of filters
*/
- KListView* listFilters;
+ TDEListView* listFilters;
/**
* Button to move a filter at top.
@@ -187,7 +187,7 @@ Q_OBJECT
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
diff --git a/kshowmail/kcmconfigs/configgeneral.cpp b/kshowmail/kcmconfigs/configgeneral.cpp
index 0bffeca..0b79257 100644
--- a/kshowmail/kcmconfigs/configgeneral.cpp
+++ b/kshowmail/kcmconfigs/configgeneral.cpp
@@ -11,13 +11,13 @@
//
#include "configgeneral.h"
-typedef KGenericFactory<ConfigGeneral, QWidget> ConfigGeneralFactory;
+typedef KGenericFactory<ConfigGeneral, TQWidget> ConfigGeneralFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfiggeneral, ConfigGeneralFactory(
"kcm_kshowmailconfiggeneral" ) );
-ConfigGeneral::ConfigGeneral( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigGeneralFactory::instance(), parent, args )
+ConfigGeneral::ConfigGeneral( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigGeneralFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -27,71 +27,71 @@ ConfigGeneral::ConfigGeneral( QWidget * parent, const char * name, const QString
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//layout for check buttons (upper half)
- QGridLayout* layMainTop = new QGridLayout( layMain, 4, 2, 15 );
+ TQGridLayout* layMainTop = new TQGridLayout( layMain, 4, 2, 15 );
layMainTop->setMargin( 20 );
//group box for timers
- QGroupBox* gboxTimers = new QGroupBox( 0, Qt::Horizontal, i18n( "&Timers" ), this, "gboxTimers" );
+ TQGroupBox* gboxTimers = new TQGroupBox( 0, TQt::Horizontal, i18n( "&Timers" ), this, "gboxTimers" );
layMain->addWidget( gboxTimers );
//layouts for timers
- QGridLayout* layTimers = new QGridLayout( gboxTimers->layout(),3, 3, 20 );
+ TQGridLayout* layTimers = new TQGridLayout( gboxTimers->layout(),3, 3, 20 );
//create items
- chkConfirmClose = new QCheckBox( i18n( "Confirm Close" ), this, "chkConfirmClose" );
- QToolTip::add( chkConfirmClose, i18n( "If checked, window close must be confirmed" ) );
+ chkConfirmClose = new TQCheckBox( i18n( "Confirm Close" ), this, "chkConfirmClose" );
+ TQToolTip::add( chkConfirmClose, i18n( "If checked, window close must be confirmed" ) );
layMainTop->addWidget( chkConfirmClose, 0, 0 );
- chkConfirmDelete = new QCheckBox( i18n( "Confirm delete" ), this, "chkConfirmDelete" );
- QToolTip::add( chkConfirmDelete, i18n( "If checked, message delete must be confirmed" ) );
+ chkConfirmDelete = new TQCheckBox( i18n( "Confirm delete" ), this, "chkConfirmDelete" );
+ TQToolTip::add( chkConfirmDelete, i18n( "If checked, message delete must be confirmed" ) );
layMainTop->addWidget( chkConfirmDelete, 0, 1 );
- chkStartMinimized = new QCheckBox( i18n( "Start Minimi&zed" ), this, "chkStartMinimized" );
- QToolTip::add( chkStartMinimized, i18n( "Application is started as icon" ) );
+ chkStartMinimized = new TQCheckBox( i18n( "Start Minimi&zed" ), this, "chkStartMinimized" );
+ TQToolTip::add( chkStartMinimized, i18n( "Application is started as icon" ) );
layMainTop->addWidget( chkStartMinimized, 1, 0 );
- chkCloseToTray = new QCheckBox( i18n( "Close to tray" ), this, "chkCloseToTray" );
- QToolTip::add( chkCloseToTray, i18n( "Close button leaves the application running in tray" ) );
+ chkCloseToTray = new TQCheckBox( i18n( "Close to tray" ), this, "chkCloseToTray" );
+ TQToolTip::add( chkCloseToTray, i18n( "Close button leaves the application running in tray" ) );
layMainTop->addWidget( chkCloseToTray, 1, 1 );
- chkMinimizeToTray = new QCheckBox( i18n( "Minimize to tray" ), this, "chkMinimizeToTray" );
- QToolTip::add( chkMinimizeToTray, i18n( "Minimizes to the tray rather than to the taskbar" ) );
+ chkMinimizeToTray = new TQCheckBox( i18n( "Minimize to tray" ), this, "chkMinimizeToTray" );
+ TQToolTip::add( chkMinimizeToTray, i18n( "Minimizes to the tray rather than to the taskbar" ) );
layMainTop->addWidget( chkMinimizeToTray, 2, 0 );
- chkShowConnectionErrors = new QCheckBox( i18n( "Show Connection Errors during refresh" ), this, "chkShowConnectionErrors" );
- QToolTip::add( chkShowConnectionErrors, i18n( "If a connection error occurs during refresh (e.g. unknown server), an error message will be shown. During other actions, this error always will be shown" ) );
+ chkShowConnectionErrors = new TQCheckBox( i18n( "Show Connection Errors during refresh" ), this, "chkShowConnectionErrors" );
+ TQToolTip::add( chkShowConnectionErrors, i18n( "If a connection error occurs during refresh (e.g. unknown server), an error message will be shown. During other actions, this error always will be shown" ) );
layMainTop->addWidget( chkShowConnectionErrors, 2, 1 );
- chkKeepNew = new QCheckBox( i18n( "&Keep mail as new" ), this, "chkKeepNew" );
- QToolTip::add( chkKeepNew, i18n( "Keep mail as new until termination" ) );
+ chkKeepNew = new TQCheckBox( i18n( "&Keep mail as new" ), this, "chkKeepNew" );
+ TQToolTip::add( chkKeepNew, i18n( "Keep mail as new until termination" ) );
layMainTop->addWidget( chkKeepNew, 3, 0 );
- QLabel* lblTimerInitial = new QLabel( i18n( "Initial Timer:" ), gboxTimers, "lblTimerInitial" );
- QLabel* lblInitialUnit = new QLabel( i18n( "[Seconds]" ), gboxTimers, "lblInitialUnit" );
- spbInitial = new QSpinBox( 0, 99999, 1, gboxTimers, "spbInitial" );
- QToolTip::add( spbInitial, i18n( "Seconds until first automatic logon (0 = no automatic)" ) );
- QToolTip::add( lblTimerInitial, i18n( "Seconds until first automatic logon (0 = no automatic)" ) );
+ TQLabel* lblTimerInitial = new TQLabel( i18n( "Initial Timer:" ), gboxTimers, "lblTimerInitial" );
+ TQLabel* lblInitialUnit = new TQLabel( i18n( "[Seconds]" ), gboxTimers, "lblInitialUnit" );
+ spbInitial = new TQSpinBox( 0, 99999, 1, gboxTimers, "spbInitial" );
+ TQToolTip::add( spbInitial, i18n( "Seconds until first automatic logon (0 = no automatic)" ) );
+ TQToolTip::add( lblTimerInitial, i18n( "Seconds until first automatic logon (0 = no automatic)" ) );
layTimers->addWidget( lblTimerInitial, 0, 0 );
layTimers->addWidget( spbInitial, 0, 1 );
layTimers->addWidget( lblInitialUnit, 0, 2 );
- QLabel* lblTimerInterval = new QLabel( i18n( "Interval Timer:" ), gboxTimers, "lblTimerInterval" );
- QLabel* lblIntervalUnit = new QLabel( i18n( "[Minutes]" ), gboxTimers, "lblIntervalUnit" );
- spbInterval = new QSpinBox( 0, 99999, 1, gboxTimers, "spbInterval" );
- QToolTip::add( spbInterval, i18n( "Minutes between automatic logon (0 = no automatic)" ) );
- QToolTip::add( lblTimerInterval, i18n( "Minutes between automatic logon (0 = no automatic)" ) );
+ TQLabel* lblTimerInterval = new TQLabel( i18n( "Interval Timer:" ), gboxTimers, "lblTimerInterval" );
+ TQLabel* lblIntervalUnit = new TQLabel( i18n( "[Minutes]" ), gboxTimers, "lblIntervalUnit" );
+ spbInterval = new TQSpinBox( 0, 99999, 1, gboxTimers, "spbInterval" );
+ TQToolTip::add( spbInterval, i18n( "Minutes between automatic logon (0 = no automatic)" ) );
+ TQToolTip::add( lblTimerInterval, i18n( "Minutes between automatic logon (0 = no automatic)" ) );
layTimers->addWidget( lblTimerInterval, 1, 0 );
layTimers->addWidget( spbInterval, 1, 1 );
layTimers->addWidget( lblIntervalUnit, 1, 2 );
- QLabel* lblTimerTimeout = new QLabel( i18n( "Timeout:" ), gboxTimers, "lblTimerTimeout" );
- QLabel* lblTimeoutUnit = new QLabel( i18n( "[Seconds]" ), gboxTimers, "lblTimeoutUnit" );
- spbTimeout = new QSpinBox( MINIMUM_TIMEOUT_TIME, 99999, 1, gboxTimers, "spbTimeout" );
- QToolTip::add( spbTimeout, i18n( "Seconds until a server connect will be canceled" ) );
- QToolTip::add( lblTimerTimeout, i18n( "Seconds until a server connect will be canceled" ) );
+ TQLabel* lblTimerTimeout = new TQLabel( i18n( "Timeout:" ), gboxTimers, "lblTimerTimeout" );
+ TQLabel* lblTimeoutUnit = new TQLabel( i18n( "[Seconds]" ), gboxTimers, "lblTimeoutUnit" );
+ spbTimeout = new TQSpinBox( MINIMUM_TIMEOUT_TIME, 99999, 1, gboxTimers, "spbTimeout" );
+ TQToolTip::add( spbTimeout, i18n( "Seconds until a server connect will be canceled" ) );
+ TQToolTip::add( lblTimerTimeout, i18n( "Seconds until a server connect will be canceled" ) );
layTimers->addWidget( lblTimerTimeout, 2, 0 );
layTimers->addWidget( spbTimeout, 2, 1 );
layTimers->addWidget( lblTimeoutUnit, 2, 2 );
@@ -111,7 +111,7 @@ ConfigGeneral::ConfigGeneral( QWidget * parent, const char * name, const QString
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configurated values
load();
@@ -175,7 +175,7 @@ void ConfigGeneral::save( )
void ConfigGeneral::slotChanged( )
{
- KCModule::changed();
+ TDECModule::changed();
}
#include "configgeneral.moc"
diff --git a/kshowmail/kcmconfigs/configgeneral.h b/kshowmail/kcmconfigs/configgeneral.h
index c61ef67..21c47bf 100644
--- a/kshowmail/kcmconfigs/configgeneral.h
+++ b/kshowmail/kcmconfigs/configgeneral.h
@@ -12,19 +12,19 @@
#ifndef CONFIGGENERAL_H
#define CONFIGGENERAL_H
-//Qt headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qtooltip.h>
-#include <qlabel.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqcheckbox.h>
+#include <ntqspinbox.h>
+#include <ntqtooltip.h>
+#include <ntqlabel.h>
//KDE headers
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
//KShowmail headers
#include <../constants.h>
@@ -33,7 +33,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure general things.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigGeneral : public KCModule
+class ConfigGeneral : public TDECModule
{
Q_OBJECT
@@ -42,7 +42,7 @@ Q_OBJECT
/**
* Generic Constructor
*/
- ConfigGeneral( QWidget *parent = 0, const char *name = 0, const QStringList &args = QStringList() );
+ ConfigGeneral( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -50,21 +50,21 @@ Q_OBJECT
~ConfigGeneral();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -76,63 +76,63 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Check box to select whether window closing must be confirmed.
*/
- QCheckBox* chkConfirmClose;
+ TQCheckBox* chkConfirmClose;
/**
* Check box to select whether deleting must be confirmed.
*/
- QCheckBox* chkConfirmDelete;
+ TQCheckBox* chkConfirmDelete;
/**
* Check box to select whether the main window will be minimized at start.
*/
- QCheckBox* chkStartMinimized;
+ TQCheckBox* chkStartMinimized;
/**
* Check box to select whether the close button leave the application running in tray.
*/
- QCheckBox* chkCloseToTray;
+ TQCheckBox* chkCloseToTray;
/**
* Check box to select whether minimizes to the tray rather than to the taskbar.
*/
- QCheckBox* chkMinimizeToTray;
+ TQCheckBox* chkMinimizeToTray;
/**
* Check box to select whether connection errors will be shown.
*/
- QCheckBox* chkShowConnectionErrors;
+ TQCheckBox* chkShowConnectionErrors;
/**
* Check box to select whether mails will be kept as new until termination.
*/
- QCheckBox* chkKeepNew;
+ TQCheckBox* chkKeepNew;
/**
* Spin box to set the initial timer.
*/
- QSpinBox* spbInitial;
+ TQSpinBox* spbInitial;
/**
* Spin box to set the interval timer.
*/
- QSpinBox* spbInterval;
+ TQSpinBox* spbInterval;
/**
* Spin box to set the time out timer.
*/
- QSpinBox* spbTimeout;
+ TQSpinBox* spbTimeout;
public slots:
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
diff --git a/kshowmail/kcmconfigs/configlog.cpp b/kshowmail/kcmconfigs/configlog.cpp
index e7eb51d..673a6ed 100644
--- a/kshowmail/kcmconfigs/configlog.cpp
+++ b/kshowmail/kcmconfigs/configlog.cpp
@@ -11,13 +11,13 @@
//
#include "configlog.h"
-typedef KGenericFactory<ConfigLog, QWidget> ConfigLogFactory;
+typedef KGenericFactory<ConfigLog, TQWidget> ConfigLogFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfiglog, ConfigLogFactory(
"kcm_kshowmailconfiglog" ) );
-ConfigLog::ConfigLog( QWidget * parent, const char * name, const QStringList & args )
- : KCModule( ConfigLogFactory::instance(), parent, args )
+ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList & args )
+ : TDECModule( ConfigLogFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -26,69 +26,69 @@ ConfigLog::ConfigLog( QWidget * parent, const char * name, const QStringList & a
//build GUI
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//widgets for deleted mails log
- QVBoxLayout* layDelMails = new QVBoxLayout( layMain, 10, "layDelMails" );
+ TQVBoxLayout* layDelMails = new TQVBoxLayout( layMain, 10, "layDelMails" );
- chkLogDeletedMails = new QCheckBox( i18n( "Log mails deleted by filter" ), this, "chkLogDeletedMails" );
+ chkLogDeletedMails = new TQCheckBox( i18n( "Log mails deleted by filter" ), this, "chkLogDeletedMails" );
layDelMails->addWidget( chkLogDeletedMails );
- QToolTip::add( chkLogDeletedMails, i18n( "Check to activate the log of mails deleted by filter." ) );
+ TQToolTip::add( chkLogDeletedMails, i18n( "Check to activate the log of mails deleted by filter." ) );
connect( chkLogDeletedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
connect( chkLogDeletedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChangeItems() ) );
- QVBoxLayout* layDelMailsConfig = new QVBoxLayout( layDelMails, 10, "layDelMailsConfig" );
+ TQVBoxLayout* layDelMailsConfig = new TQVBoxLayout( layDelMails, 10, "layDelMailsConfig" );
layDelMailsConfig->setMargin( 10 );
- grpDelMailsRemove = new QButtonGroup( NULL, "grpDelMailsRemove" );
+ grpDelMailsRemove = new TQButtonGroup( NULL, "grpDelMailsRemove" );
connect( grpDelMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) );
connect( grpDelMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChangeItems() ) );
- btnDelMailsRemoveExit = new QRadioButton( i18n( "Remove log entries at exit" ), this, "btnDelMailsRemoveExit" );
+ btnDelMailsRemoveExit = new TQRadioButton( i18n( "Remove log entries at exit" ), this, "btnDelMailsRemoveExit" );
grpDelMailsRemove->insert( btnDelMailsRemoveExit, ID_BUTTON_REMOVE_AT_EXIT );
layDelMailsConfig->addWidget( btnDelMailsRemoveExit );
- QHBoxLayout* layDelMailsConfigDays = new QHBoxLayout( layDelMailsConfig, 0, "layDelMailsConfigDays" );
- layDelMailsConfigDays->setAlignment( Qt::AlignLeft );
- btnDelMailsRemoveDays = new QRadioButton( i18n( "Remove log entries after" ), this, "btnDelMailsRemoveDays" );
+ TQHBoxLayout* layDelMailsConfigDays = new TQHBoxLayout( layDelMailsConfig, 0, "layDelMailsConfigDays" );
+ layDelMailsConfigDays->setAlignment( TQt::AlignLeft );
+ btnDelMailsRemoveDays = new TQRadioButton( i18n( "Remove log entries after" ), this, "btnDelMailsRemoveDays" );
grpDelMailsRemove->insert( btnDelMailsRemoveDays, ID_BUTTON_REMOVE_AFTER_DAYS );
layDelMailsConfigDays->addWidget( btnDelMailsRemoveDays );
- spbDelDays = new QSpinBox( 1, 999999, 1, this, "spbDelDays" );
+ spbDelDays = new TQSpinBox( 1, 999999, 1, this, "spbDelDays" );
connect( spbDelDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
connect( spbDelDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChangeItems() ) );
spbDelDays->setSuffix( i18n( " Days" ) );
- spbDelDays->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum );
+ spbDelDays->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
layDelMailsConfigDays->addWidget( spbDelDays );
//widgets for moved mails log
- QVBoxLayout* layMovMails = new QVBoxLayout( layMain, 10, "layMovMails" );
+ TQVBoxLayout* layMovMails = new TQVBoxLayout( layMain, 10, "layMovMails" );
- chkLogMovedMails = new QCheckBox( i18n( "Log mails moved by filter" ), this, "chkLogMovedMails" );
+ chkLogMovedMails = new TQCheckBox( i18n( "Log mails moved by filter" ), this, "chkLogMovedMails" );
layMovMails->addWidget( chkLogMovedMails );
- QToolTip::add( chkLogMovedMails, i18n( "Check to activate the log of mails moved by filter." ) );
+ TQToolTip::add( chkLogMovedMails, i18n( "Check to activate the log of mails moved by filter." ) );
connect( chkLogMovedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
connect( chkLogMovedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChangeItems() ) );
- QVBoxLayout* layMovMailsConfig = new QVBoxLayout( layMovMails, 10, "layMovMailsConfig" );
+ TQVBoxLayout* layMovMailsConfig = new TQVBoxLayout( layMovMails, 10, "layMovMailsConfig" );
layMovMailsConfig->setMargin( 10 );
- grpMovMailsRemove = new QButtonGroup( NULL, "grpMovMailsRemove" );
+ grpMovMailsRemove = new TQButtonGroup( NULL, "grpMovMailsRemove" );
connect( grpMovMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) );
connect( grpMovMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChangeItems() ) );
- btnMovMailsRemoveExit = new QRadioButton( i18n( "Remove log entries at exit" ), this, "btnMovMailsRemoveExit" );
+ btnMovMailsRemoveExit = new TQRadioButton( i18n( "Remove log entries at exit" ), this, "btnMovMailsRemoveExit" );
grpMovMailsRemove->insert( btnMovMailsRemoveExit, ID_BUTTON_REMOVE_AT_EXIT );
layMovMailsConfig->addWidget( btnMovMailsRemoveExit );
- QHBoxLayout* layMovMailsConfigDays = new QHBoxLayout( layMovMailsConfig, 0, "layMovMailsConfigDays" );
- layMovMailsConfigDays->setAlignment( Qt::AlignLeft );
- btnMovMailsRemoveDays = new QRadioButton( i18n( "Remove log entries after" ), this, "btnMovMailsRemoveDays" );
+ TQHBoxLayout* layMovMailsConfigDays = new TQHBoxLayout( layMovMailsConfig, 0, "layMovMailsConfigDays" );
+ layMovMailsConfigDays->setAlignment( TQt::AlignLeft );
+ btnMovMailsRemoveDays = new TQRadioButton( i18n( "Remove log entries after" ), this, "btnMovMailsRemoveDays" );
grpMovMailsRemove->insert( btnMovMailsRemoveDays, ID_BUTTON_REMOVE_AFTER_DAYS );
layMovMailsConfigDays->addWidget( btnMovMailsRemoveDays );
- spbMovDays = new QSpinBox( 1, 999999, 1, this, "spbMovDays" );
+ spbMovDays = new TQSpinBox( 1, 999999, 1, this, "spbMovDays" );
connect( spbMovDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
connect( spbMovDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChangeItems() ) );
spbMovDays->setSuffix( i18n( " Days" ) );
- spbMovDays->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum );
+ spbMovDays->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
layMovMailsConfigDays->addWidget( spbMovDays );
//the log of moved mails is not saved yet, maybe later...
@@ -97,7 +97,7 @@ ConfigLog::ConfigLog( QWidget * parent, const char * name, const QStringList & a
spbMovDays->setHidden( true );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configured values
load();
@@ -207,7 +207,7 @@ void ConfigLog::save()
void ConfigLog::slotChanged()
{
- KCModule::changed();
+ TDECModule::changed();
}
void ConfigLog::slotChangeItems()
diff --git a/kshowmail/kcmconfigs/configlog.h b/kshowmail/kcmconfigs/configlog.h
index 84e6fd4..7fbd9c3 100644
--- a/kshowmail/kcmconfigs/configlog.h
+++ b/kshowmail/kcmconfigs/configlog.h
@@ -17,19 +17,19 @@
#define ID_BUTTON_REMOVE_AFTER_DAYS 2
//qt headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qtooltip.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qspinbox.h>
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqtooltip.h>
+#include <ntqcheckbox.h>
+#include <ntqradiobutton.h>
+#include <ntqbuttongroup.h>
+#include <ntqspinbox.h>
//KDE headers
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
//Kshowmail headers
#include "../constants.h"
@@ -39,7 +39,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure the log.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigLog : public KCModule
+class ConfigLog : public TDECModule
{
Q_OBJECT
@@ -48,7 +48,7 @@ Q_OBJECT
/**
* Generic constructor
*/
- ConfigLog( QWidget* parent = 0, const char* name = 0, const QStringList &args = QStringList() );
+ ConfigLog( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -56,21 +56,21 @@ Q_OBJECT
~ConfigLog();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -82,63 +82,63 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Checkbox to activate log of deleted mails
*/
- QCheckBox* chkLogDeletedMails;
+ TQCheckBox* chkLogDeletedMails;
/**
* Checkbox to activate log of moved mails
*/
- QCheckBox* chkLogMovedMails;
+ TQCheckBox* chkLogMovedMails;
/**
* Combines the radio buttons to select the kind of removing log entries of deleted mails
*/
- QButtonGroup* grpDelMailsRemove;
+ TQButtonGroup* grpDelMailsRemove;
/**
* Combines the radio buttons to select the kind of removing log entries of moved mails
*/
- QButtonGroup* grpMovMailsRemove;
+ TQButtonGroup* grpMovMailsRemove;
/**
* Spinbox to select the number of days to remove.
*/
- QSpinBox* spbDelDays;
+ TQSpinBox* spbDelDays;
/**
* Spinbox to select the number of days to remove.
*/
- QSpinBox* spbMovDays;
+ TQSpinBox* spbMovDays;
/**
* Radio button to select the removing of entries about deleted mails at application exit.
*/
- QRadioButton* btnDelMailsRemoveExit;
+ TQRadioButton* btnDelMailsRemoveExit;
/**
* Radio button to select the removing of entries about deleted mails after some days.
*/
- QRadioButton* btnDelMailsRemoveDays;
+ TQRadioButton* btnDelMailsRemoveDays;
/**
* Radio button to select the removing of entries about moved mails at application exit.
*/
- QRadioButton* btnMovMailsRemoveExit;
+ TQRadioButton* btnMovMailsRemoveExit;
/**
* Radio button to select the removing of entries about moved mails after some days.
*/
- QRadioButton* btnMovMailsRemoveDays;
+ TQRadioButton* btnMovMailsRemoveDays;
private slots:
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
diff --git a/kshowmail/kcmconfigs/configspamcheck.cpp b/kshowmail/kcmconfigs/configspamcheck.cpp
index 44f7ef7..0b4d11e 100644
--- a/kshowmail/kcmconfigs/configspamcheck.cpp
+++ b/kshowmail/kcmconfigs/configspamcheck.cpp
@@ -12,14 +12,14 @@
#include "configspamcheck.h"
-typedef KGenericFactory<ConfigSpamcheck, QWidget> ConfigSpamcheckFactory;
+typedef KGenericFactory<ConfigSpamcheck, TQWidget> ConfigSpamcheckFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kshowmailconfigspamcheck, ConfigSpamcheckFactory(
"kcm_kshowmailconfigspamcheck" ) );
-ConfigSpamcheck::ConfigSpamcheck(QWidget * parent, const char * name, const QStringList & args)
- : KCModule( ConfigSpamcheckFactory::instance(), parent, args )
+ConfigSpamcheck::ConfigSpamcheck(TQWidget * parent, const char * name, const TQStringList & args)
+ : TDECModule( ConfigSpamcheckFactory::instance(), parent, args )
{
//set the module name
if ( !name )
@@ -29,29 +29,29 @@ ConfigSpamcheck::ConfigSpamcheck(QWidget * parent, const char * name, const QStr
//---------
//main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, 10 );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, 10 );
//description
- QLabel* lblDescription = new QLabel( this, "lblDescription" );
- lblDescription->setAlignment( Qt::WordBreak );
- lblDescription->setText( QString( "<i>%1</i>" ).arg( i18n( "KShowmail uses SpamAssassin to check the mails for spam. You have to install, configure and start the SpamAssassin daemon, before you can use this service." ) ) );
- lblDescription->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum );
+ TQLabel* lblDescription = new TQLabel( this, "lblDescription" );
+ lblDescription->setAlignment( TQt::WordBreak );
+ lblDescription->setText( TQString( "<i>%1</i>" ).arg( i18n( "KShowmail uses SpamAssassin to check the mails for spam. You have to install, configure and start the SpamAssassin daemon, before you can use this service." ) ) );
+ lblDescription->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
layMain->addWidget( lblDescription );
//Test button
btnTest = new KPushButton( KStdGuiItem::test(), this, "btnTest" );
- btnTest->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum );
+ btnTest->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
layMain->addWidget( btnTest );
connect( btnTest, SIGNAL( clicked() ), this, SLOT( slotTestSpamAssassin() ) );
//action
- gboxAction = new QGroupBox( 0, Qt::Horizontal, i18n( "Action for Spam" ), this, "gboxAction" );
- QHBoxLayout* layAction = new QHBoxLayout( gboxAction->layout(), 10 );
+ gboxAction = new TQGroupBox( 0, TQt::Horizontal, i18n( "Action for Spam" ), this, "gboxAction" );
+ TQHBoxLayout* layAction = new TQHBoxLayout( gboxAction->layout(), 10 );
layMain->addWidget( gboxAction );
cmbAction = new KComboBox( gboxAction, "cmbAction" );
layAction->addWidget( cmbAction );
- QToolTip::add( cmbAction, i18n( "Choose the action for spam mails." ) );
+ TQToolTip::add( cmbAction, i18n( "Choose the action for spam mails." ) );
connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotActionChanged( int ) ) );
connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotChanged() ) );
@@ -63,12 +63,12 @@ ConfigSpamcheck::ConfigSpamcheck(QWidget * parent, const char * name, const QStr
//create edit line to defined the mailbox for move
txtMailbox = new KLineEdit( gboxAction );
layAction->addWidget( txtMailbox );
- connect( txtMailbox, SIGNAL( textChanged( const QString & ) ), this, SLOT( slotChanged() ) );
+ connect( txtMailbox, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotChanged() ) );
//create wizard button to configure mailbox
- btnMailboxWizard= new KPushButton( KGuiItem( QString::null, "wizard" ), gboxAction );
+ btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxAction );
layAction->addWidget( btnMailboxWizard );
- QToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
+ TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
//set defaults
@@ -86,7 +86,7 @@ ConfigSpamcheck::ConfigSpamcheck(QWidget * parent, const char * name, const QStr
gboxAction->setEnabled( isSpamAssassinRunning() );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load configured values
load();
@@ -128,7 +128,7 @@ void ConfigSpamcheck::defaults()
}
if( DEFAULT_SPAMCHECK_ACTION == CONFIG_VALUE_SPAMCHECK_ACTION_MOVE )
- txtMailbox->setText( QString( DEFAULT_SPAMCHECK_ACTION_MOVE_MAILBOX ) );
+ txtMailbox->setText( TQString( DEFAULT_SPAMCHECK_ACTION_MOVE_MAILBOX ) );
else
txtMailbox->clear();
@@ -166,7 +166,7 @@ void ConfigSpamcheck::save()
void ConfigSpamcheck::slotChanged()
{
- KCModule::changed();
+ TDECModule::changed();
}
void ConfigSpamcheck::slotActionChanged( int index )
@@ -190,7 +190,7 @@ void ConfigSpamcheck::slotOpenMailBoxWizard( )
wizard.setCaption( i18n( "Mailbox Select" ) );
int res = wizard.exec();
- if( res == QDialog::Accepted )
+ if( res == TQDialog::Accepted )
txtMailbox->setText( wizard.getPath() );
}
@@ -209,7 +209,7 @@ bool ConfigSpamcheck::isSpamAssassinRunning( ) const
while( chars_read > 0 )
{
buffer[ chars_read - 1 ] = '\0';
- QString output( buffer );
+ TQString output( buffer );
found = output.contains( NAME_SPAMASSASSIN_DAEMON ) > 0;
chars_read = fread( buffer, sizeof( char ), BUFSIZ, read_fp );
}
diff --git a/kshowmail/kcmconfigs/configspamcheck.h b/kshowmail/kcmconfigs/configspamcheck.h
index d2af35c..61fe431 100644
--- a/kshowmail/kcmconfigs/configspamcheck.h
+++ b/kshowmail/kcmconfigs/configspamcheck.h
@@ -18,22 +18,22 @@
#include <stdio.h>
#include <string.h>
-//Qt headers
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qtooltip.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqgroupbox.h>
+#include <ntqtooltip.h>
//KDE headers
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <kcombobox.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
//Kshowmail headers
#include "../constants.h"
@@ -49,7 +49,7 @@
* @brief Part of the setup dialog (KShowMailApp::SetupDialog) to configure the spam check.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class ConfigSpamcheck : public KCModule
+class ConfigSpamcheck : public TDECModule
{
Q_OBJECT
@@ -59,7 +59,7 @@ Q_OBJECT
/**
* Generic constructor
*/
- ConfigSpamcheck( QWidget* parent = 0, const char* name = 0, const QStringList &args = QStringList() );
+ ConfigSpamcheck( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -67,21 +67,21 @@ Q_OBJECT
~ConfigSpamcheck();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to reflect the current settings stored in the
* config file.
*/
virtual void load();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Sets the user interface elements to default values.
* This method is called when the user clicks the "Default" button.
*/
virtual void defaults();
/**
- * Overloaded method of KCModule.
+ * Overloaded method of TDECModule.
* Stores the config information as shown in the user interface in the
* config file.
* Is called when the user clicks "Apply" or "Ok".
@@ -93,7 +93,7 @@ Q_OBJECT
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Button to test for a running SpamAssassin
@@ -118,13 +118,13 @@ Q_OBJECT
/**
* Contains the widgets of action configuration.
*/
- QGroupBox* gboxAction;
+ TQGroupBox* gboxAction;
private slots:
/**
* Connected with the configuration items.
- * Calls the slot changed() of KCModule to notify the dialog about the change.
+ * Calls the slot changed() of TDECModule to notify the dialog about the change.
*/
void slotChanged();
diff --git a/kshowmail/kcmconfigs/encryption.cpp b/kshowmail/kcmconfigs/encryption.cpp
index dd3bcec..0bc1efe 100644
--- a/kshowmail/kcmconfigs/encryption.cpp
+++ b/kshowmail/kcmconfigs/encryption.cpp
@@ -23,11 +23,11 @@ int Encryption::hexbyt( const char c )
return c - 'A' + 10;
}
-const QString Encryption::crypt( const KURL& url )
+const TQString Encryption::crypt( const KURL& url )
{
char result[50];
char scramble2[50];
- QString hexresult;
+ TQString hexresult;
memset (result, 0, 50);
memset (scramble2, 0, 50);
@@ -69,7 +69,7 @@ const QString Encryption::crypt( const KURL& url )
return hexresult;
}
-const QString Encryption::decrypt( const QString& pass )
+const TQString Encryption::decrypt( const TQString& pass )
{
char result[50];
diff --git a/kshowmail/kcmconfigs/encryption.h b/kshowmail/kcmconfigs/encryption.h
index 376cc26..4c68b4f 100644
--- a/kshowmail/kcmconfigs/encryption.h
+++ b/kshowmail/kcmconfigs/encryption.h
@@ -10,8 +10,8 @@
//
//
-//Qt headers
-#include <qstring.h>
+//TQt headers
+#include <ntqstring.h>
//KDE headers
#include <kurl.h>
@@ -35,12 +35,12 @@ namespace Encryption
* @param url the url with password, host and user name
* @return encrypted password
*/
- const QString crypt( const KURL& url );
+ const TQString crypt( const KURL& url );
/**
* Decrypts the given encrypted password.
* @param pass encrypted password
* @return decrypted password
*/
- const QString decrypt( const QString& pass );
+ const TQString decrypt( const TQString& pass );
}
diff --git a/kshowmail/kcmconfigs/filtercriteriawidget.cpp b/kshowmail/kcmconfigs/filtercriteriawidget.cpp
index c7ea8c5..ae4709c 100644
--- a/kshowmail/kcmconfigs/filtercriteriawidget.cpp
+++ b/kshowmail/kcmconfigs/filtercriteriawidget.cpp
@@ -11,15 +11,15 @@
//
#include "filtercriteriawidget.h"
-FilterCriteriaWidget::FilterCriteriaWidget( QWidget *parent, const char *name )
- : QWidget( parent, name )
+FilterCriteriaWidget::FilterCriteriaWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
//this is the main layout
- QVBoxLayout* layMain = new QVBoxLayout( this, 0, KDialog::spacingHint(), "layMain" );
+ TQVBoxLayout* layMain = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "layMain" );
//and now the layouts of the first and second line
- QHBoxLayout* layLine1 = new QHBoxLayout( layMain, KDialog::spacingHint(), "layLine1" );
- QHBoxLayout* layLine2 = new QHBoxLayout( layMain, KDialog::spacingHint(), "layLine2" );
+ TQHBoxLayout* layLine1 = new TQHBoxLayout( layMain, KDialog::spacingHint(), "layLine1" );
+ TQHBoxLayout* layLine2 = new TQHBoxLayout( layMain, KDialog::spacingHint(), "layLine2" );
//Source Select
cmbSource = new KComboBox( this, "cmbSource" );
@@ -101,10 +101,10 @@ FilterCriteriaWidget::FilterCriteriaWidget( QWidget *parent, const char *name )
connect( btnOpenRegExpEditor, SIGNAL( clicked() ), this, SLOT( slotOpenRegExpEditor() ) );
//check whether the KRegExpEditor is available
- kRegExpEditorAvailable = !KTrader::self()->query( "KRegExpEditor/KRegExpEditor" ).isEmpty();
+ kRegExpEditorAvailable = !TDETrader::self()->query( "KRegExpEditor/KRegExpEditor" ).isEmpty();
//checkbox to select case sensitve
- chkCaseSensitive = new QCheckBox( i18n( "Case sensitive" ), this, "chkCaseSensitive" );
+ chkCaseSensitive = new TQCheckBox( i18n( "Case sensitive" ), this, "chkCaseSensitive" );
chkCaseSensitive->setChecked( DEFAULT_FILTER_CRITERIA_CASE_SENSITIVE ); //set default
layLine2->addWidget( chkCaseSensitive );
@@ -185,12 +185,12 @@ void FilterCriteriaWidget::slotSetWidgets( )
void FilterCriteriaWidget::slotOpenRegExpEditor( )
{
- QDialog* editorDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor" );
+ TQDialog* editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
if( editorDialog != NULL )
{
- //kdeutils was installed, so the dialog was found fetch the editor interface
- KRegExpEditorInterface* editor = static_cast<KRegExpEditorInterface*>( editorDialog->qt_cast( "KRegExpEditorInterface" ) );
+ //tdeutils was installed, so the dialog was found fetch the editor interface
+ KRegExpEditorInterface* editor = static_cast<KRegExpEditorInterface*>( editorDialog->tqt_cast( "KRegExpEditorInterface" ) );
if( editor == NULL )
{
KMessageBox::error( this, i18n( "The Regular Expression Editor could not be initilized." ) );
@@ -201,7 +201,7 @@ void FilterCriteriaWidget::slotOpenRegExpEditor( )
editor->setRegExp( txtCompValueText->text() );
//exec the dialog
- if( editorDialog->exec() == QDialog::Accepted )
+ if( editorDialog->exec() == TQDialog::Accepted )
txtCompValueText->setText( editor->regExp() );
//delete dialog
@@ -244,7 +244,7 @@ void FilterCriteriaWidget::setNumCriteria( int source, int condition, uint value
slotSetWidgets();
}
-void FilterCriteriaWidget::setTextCriteria( int source, int condition, QString value, bool cs )
+void FilterCriteriaWidget::setTextCriteria( int source, int condition, TQString value, bool cs )
{
//set source
switch( source )
diff --git a/kshowmail/kcmconfigs/filtercriteriawidget.h b/kshowmail/kcmconfigs/filtercriteriawidget.h
index 14721c2..ca5548f 100644
--- a/kshowmail/kcmconfigs/filtercriteriawidget.h
+++ b/kshowmail/kcmconfigs/filtercriteriawidget.h
@@ -12,24 +12,24 @@
#ifndef FILTERCRITERIAWIDGET_H
#define FILTERCRITERIAWIDGET_H
-//Qt headers
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+//TQt headers
+#include <ntqwidget.h>
+#include <ntqlayout.h>
+#include <ntqcheckbox.h>
//KDE headers
#include <klineedit.h>
#include <kseparator.h>
#include <kdialog.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kpushbutton.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdemessagebox.h>
+#include <tdeparts/componentfactory.h>
//KShowmail headers
#include <../constants.h>
@@ -63,7 +63,7 @@ using namespace Types;
* @brief Part of the filter setup dialog (class FilterSetupDialog) to show a criteria of the selected filter.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class FilterCriteriaWidget : public QWidget
+class FilterCriteriaWidget : public TQWidget
{
Q_OBJECT
@@ -73,7 +73,7 @@ Q_OBJECT
/**
* Constructor
*/
- FilterCriteriaWidget( QWidget *parent = 0, const char *name = 0 );
+ FilterCriteriaWidget( TQWidget *parent = 0, const char *name = 0 );
/**
* Destructor
@@ -95,7 +95,7 @@ Q_OBJECT
* @param value comparison string
* @param cs TRUE - comparison is case sensitive; FALSE - comparison is not case sensitive
*/
- void setTextCriteria( int source, int condition, QString value, bool cs );
+ void setTextCriteria( int source, int condition, TQString value, bool cs );
/**
* Returns the values of the criteria.
@@ -133,7 +133,7 @@ Q_OBJECT
/**
* Checkbox to select case sensitive.
*/
- QCheckBox* chkCaseSensitive;
+ TQCheckBox* chkCaseSensitive;
/**
* Button to open the regular expression editor.
diff --git a/kshowmail/kcmconfigs/filtersetupdialog.cpp b/kshowmail/kcmconfigs/filtersetupdialog.cpp
index 58e390b..7b5c297 100644
--- a/kshowmail/kcmconfigs/filtersetupdialog.cpp
+++ b/kshowmail/kcmconfigs/filtersetupdialog.cpp
@@ -11,8 +11,8 @@
//
#include "filtersetupdialog.h"
-FilterSetupDialog::FilterSetupDialog( QWidget* parent, FilterSetupItem* item )
- : KDialogBase( parent, "FilterSetupDialog", true, QString::null, Ok|Cancel, Ok, true )
+FilterSetupDialog::FilterSetupDialog( TQWidget* parent, FilterSetupItem* item )
+ : KDialogBase( parent, "FilterSetupDialog", true, TQString::null, Ok|Cancel, Ok, true )
{
//save pointer to account and view
filter = item;
@@ -25,32 +25,32 @@ FilterSetupDialog::FilterSetupDialog( QWidget* parent, FilterSetupItem* item )
setCaption( i18n( "Edit filter" ) );
//create main widget and layout
- QWidget* pgMain = new QWidget( this );
+ TQWidget* pgMain = new TQWidget( this );
setMainWidget( pgMain );
- QVBoxLayout* layMain = new QVBoxLayout( pgMain, 0, spacingHint() );
+ TQVBoxLayout* layMain = new TQVBoxLayout( pgMain, 0, spacingHint() );
//create filter name widgets
- QHBoxLayout* layName = new QHBoxLayout( layMain, spacingHint() );
- QLabel* lblName = new QLabel( i18n( "Name:" ), pgMain, "lblName" );
+ TQHBoxLayout* layName = new TQHBoxLayout( layMain, spacingHint() );
+ TQLabel* lblName = new TQLabel( i18n( "Name:" ), pgMain, "lblName" );
layName->addWidget( lblName );
txtName = new KLineEdit( pgMain, "txtName" );
layName->addWidget( txtName );
//create group boxes and layouts for rules and action
- QGroupBox* gboxCriteria = new QGroupBox( 0, Qt::Horizontal, i18n( "Filter Criterias" ), pgMain, "gboxCriteria" );
- QVBoxLayout* layCriteria = new QVBoxLayout( gboxCriteria->layout(), spacingHint() );
+ TQGroupBox* gboxCriteria = new TQGroupBox( 0, TQt::Horizontal, i18n( "Filter Criterias" ), pgMain, "gboxCriteria" );
+ TQVBoxLayout* layCriteria = new TQVBoxLayout( gboxCriteria->layout(), spacingHint() );
layMain->addWidget( gboxCriteria );
- QGroupBox* gboxAction = new QGroupBox( 0, Qt::Horizontal, i18n( "Filter Action" ), pgMain, "gboxAction" );
- QHBoxLayout* layAction = new QHBoxLayout( gboxAction->layout(), spacingHint() );
+ TQGroupBox* gboxAction = new TQGroupBox( 0, TQt::Horizontal, i18n( "Filter Action" ), pgMain, "gboxAction" );
+ TQHBoxLayout* layAction = new TQHBoxLayout( gboxAction->layout(), spacingHint() );
layMain->addWidget( gboxAction );
//radio buttons to select the kind of linkage between filter criterias
- QHBoxLayout* layLinkage = new QHBoxLayout( layCriteria, spacingHint(), "layLinkage" );
- grpLinkage = new QButtonGroup( NULL, "grpLinkage" );
+ TQHBoxLayout* layLinkage = new TQHBoxLayout( layCriteria, spacingHint(), "layLinkage" );
+ grpLinkage = new TQButtonGroup( NULL, "grpLinkage" );
- QRadioButton* btnMatchAll = new QRadioButton( i18n( "Match all of the following" ), gboxCriteria, "btnMatchAll" );
- QRadioButton* btnMatchAny = new QRadioButton( i18n( "Match any of the following" ), gboxCriteria, "btnMatchAny" );
+ TQRadioButton* btnMatchAll = new TQRadioButton( i18n( "Match all of the following" ), gboxCriteria, "btnMatchAll" );
+ TQRadioButton* btnMatchAny = new TQRadioButton( i18n( "Match any of the following" ), gboxCriteria, "btnMatchAny" );
grpLinkage->insert( btnMatchAll, ID_BUTTON_LINKAGE_MATCH_ALL );
grpLinkage->insert( btnMatchAny, ID_BUTTON_LINKAGE_MATCH_ANY );
layLinkage->addWidget( btnMatchAll );
@@ -64,16 +64,16 @@ FilterSetupDialog::FilterSetupDialog( QWidget* parent, FilterSetupItem* item )
}
//this widget holds one or more criterias (class FilterCriteriaWidget)
- wdgCriteriasHolding = new QWidget( gboxCriteria, "gboxCriteria" );
- layCriteriasHolding = new QVBoxLayout( wdgCriteriasHolding, 0, spacingHint(), "layCriteriasHolding" );
+ wdgCriteriasHolding = new TQWidget( gboxCriteria, "gboxCriteria" );
+ layCriteriasHolding = new TQVBoxLayout( wdgCriteriasHolding, 0, spacingHint(), "layCriteriasHolding" );
layCriteria->addWidget( wdgCriteriasHolding );
//buttons to add or remove criterias
- QHBoxLayout* layButtons = new QHBoxLayout( layCriteria, spacingHint(), "layButtons" );
+ TQHBoxLayout* layButtons = new TQHBoxLayout( layCriteria, spacingHint(), "layButtons" );
btnAddCriteria = new KPushButton( KGuiItem( i18n( "More" ), "button_more", i18n( "Add a further criteria." ) ), gboxCriteria, "btnAddCriteria" );
btnRemoveCriteria = new KPushButton( KGuiItem( i18n( "Fewer" ), "button_fewer", i18n( "Remove the last criteria." ) ), gboxCriteria, "btnRemoveCriteria" );
- btnAddCriteria->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
- btnRemoveCriteria->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+ btnAddCriteria->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
+ btnRemoveCriteria->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
layButtons->addWidget( btnAddCriteria );
layButtons->addWidget( btnRemoveCriteria );
layButtons->addStretch();
@@ -83,7 +83,7 @@ FilterSetupDialog::FilterSetupDialog( QWidget* parent, FilterSetupItem* item )
//create combobox to select action
cmbAction = new KComboBox( gboxAction, "cmbAction" );
layAction->addWidget( cmbAction );
- QToolTip::add( cmbAction, i18n( "Choose the action for all mails which are filtered by this filter." ) );
+ TQToolTip::add( cmbAction, i18n( "Choose the action for all mails which are filtered by this filter." ) );
connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotActionChanged( int ) ) );
//insert items
@@ -99,9 +99,9 @@ FilterSetupDialog::FilterSetupDialog( QWidget* parent, FilterSetupItem* item )
layAction->addWidget( txtMailbox );
//create wizard button to configure mailbox
- btnMailboxWizard= new KPushButton( KGuiItem( QString::null, "wizard" ), gboxAction );
+ btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxAction );
layAction->addWidget( btnMailboxWizard );
- QToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
+ TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
//set default action
@@ -239,7 +239,7 @@ FilterCriteriaWidget* FilterSetupDialog::slotAddCriteriaWidget( )
layCriteriasHolding->addWidget( crit );
//hide remove button if necessary
- const QObjectList* critList = wdgCriteriasHolding->children();
+ const TQObjectList* critList = wdgCriteriasHolding->children();
if( critList != NULL )
{
@@ -257,7 +257,7 @@ FilterCriteriaWidget* FilterSetupDialog::slotAddCriteriaWidget( )
void FilterSetupDialog::slotRemoveCriteriaWidget( )
{
//get a list of all criteria widgets
- const QObjectList* critList = wdgCriteriasHolding->children();
+ const TQObjectList* critList = wdgCriteriasHolding->children();
//return, if the pointer to the list is invalid
if( critList == NULL )
@@ -272,16 +272,16 @@ void FilterSetupDialog::slotRemoveCriteriaWidget( )
if( critList->count() <= 2 ) return;
//get iterator
- QObjectListIterator it( *critList );
+ TQObjectListIterator it( *critList );
//get last child
- QObject* obj = it.toLast();
+ TQObject* obj = it.toLast();
//remove last child
if( obj->isA( "FilterCriteriaWidget" ) )
{
- ((QWidget*)obj)->setHidden( true );
- layCriteriasHolding->remove( (QWidget*)obj );
+ ((TQWidget*)obj)->setHidden( true );
+ layCriteriasHolding->remove( (TQWidget*)obj );
wdgCriteriasHolding->removeChild( obj );
}
else
@@ -322,7 +322,7 @@ void FilterSetupDialog::addCriteriaWidget( int source, int condition, uint value
crit->setNumCriteria( source, condition, value );
}
-void FilterSetupDialog::addCriteriaWidget( int source, int condition, QString value, bool cs )
+void FilterSetupDialog::addCriteriaWidget( int source, int condition, TQString value, bool cs )
{
//check source and condition
if( source != CONFIG_VALUE_FILTER_CRITERIA_SOURCE_FROM &&
@@ -391,12 +391,12 @@ void FilterSetupDialog::slotOk()
//criteria widgets
//get list of all children of the criterias holding widget
- const QObjectList* children = wdgCriteriasHolding->children();
+ const TQObjectList* children = wdgCriteriasHolding->children();
//get iterator of the list
- QObjectListIterator it( *children );
+ TQObjectListIterator it( *children );
- QObject* obj; //current child object
+ TQObject* obj; //current child object
FilterCriteriaList_Type critList; //list of criterias; will be give to the filter setup item
//iterate over the children list
@@ -442,7 +442,7 @@ void FilterSetupDialog::slotOpenMailBoxWizard( )
wizard.setCaption( i18n( "Mailbox Select" ) );
int res = wizard.exec();
- if( res == QDialog::Accepted )
+ if( res == TQDialog::Accepted )
txtMailbox->setText( wizard.getPath() );
}
diff --git a/kshowmail/kcmconfigs/filtersetupdialog.h b/kshowmail/kcmconfigs/filtersetupdialog.h
index a9fd761..b989238 100644
--- a/kshowmail/kcmconfigs/filtersetupdialog.h
+++ b/kshowmail/kcmconfigs/filtersetupdialog.h
@@ -16,19 +16,19 @@
#define ID_BUTTON_LINKAGE_MATCH_ALL 1
#define ID_BUTTON_LINKAGE_MATCH_ANY 2
-//Qt headers
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qvbox.h>
-#include <qobjectlist.h>
-#include <qtooltip.h>
-#include <qlabel.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqgroupbox.h>
+#include <ntqbuttongroup.h>
+#include <ntqradiobutton.h>
+#include <ntqvbox.h>
+#include <ntqobjectlist.h>
+#include <ntqtooltip.h>
+#include <ntqlabel.h>
//KDE headers
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kcombobox.h>
#include <klineedit.h>
@@ -62,7 +62,7 @@ class FilterSetupDialog : public KDialogBase
* @param parent parent of the dialog
* @param item filter to setup;
*/
- FilterSetupDialog( QWidget* parent, FilterSetupItem* item = NULL );
+ FilterSetupDialog( TQWidget* parent, FilterSetupItem* item = NULL );
/**
* Destructor
@@ -79,7 +79,7 @@ class FilterSetupDialog : public KDialogBase
/**
* View which shows the filter items.
*/
- KListView* ListView;
+ TDEListView* ListView;
/**
* Contains the filter name.
@@ -89,17 +89,17 @@ class FilterSetupDialog : public KDialogBase
/**
* Combines the radio buttons to select the kind of linkage between the criterias.
*/
- QButtonGroup* grpLinkage;
+ TQButtonGroup* grpLinkage;
/**
* This widget holds one ore more filter criteria dialogs (class FilterCriteriaWidget).
*/
- QWidget* wdgCriteriasHolding;
+ TQWidget* wdgCriteriasHolding;
/**
* Layout for wdgCriterias.
*/
- QVBoxLayout* layCriteriasHolding;
+ TQVBoxLayout* layCriteriasHolding;
/**
* Button to add a criteria dialog.
@@ -149,7 +149,7 @@ class FilterSetupDialog : public KDialogBase
* @param value comparison string
* @param cs TRUE - comparison is case sensitive; FALSE - comparison is not case sensitive
*/
- void addCriteriaWidget( int source, int condition, QString value, bool cs );
+ void addCriteriaWidget( int source, int condition, TQString value, bool cs );
protected slots:
diff --git a/kshowmail/kcmconfigs/filtersetupitem.cpp b/kshowmail/kcmconfigs/filtersetupitem.cpp
index ef16a53..d964296 100644
--- a/kshowmail/kcmconfigs/filtersetupitem.cpp
+++ b/kshowmail/kcmconfigs/filtersetupitem.cpp
@@ -11,8 +11,8 @@
//
#include "filtersetupitem.h"
-FilterSetupItem::FilterSetupItem( KListView* parent )
- : KListViewItem( parent )
+FilterSetupItem::FilterSetupItem( TDEListView* parent )
+ : TDEListViewItem( parent )
{
//set default number
number = 0;
@@ -20,8 +20,8 @@ FilterSetupItem::FilterSetupItem( KListView* parent )
init();
}
-FilterSetupItem::FilterSetupItem( KListView* parent, uint num )
- : KListViewItem( parent )
+FilterSetupItem::FilterSetupItem( TDEListView* parent, uint num )
+ : TDEListViewItem( parent )
{
//store the given filter number
number = num;
@@ -36,7 +36,7 @@ FilterSetupItem::~FilterSetupItem()
void FilterSetupItem::init( )
{
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//set default values
setName( i18n( DEFAULT_FILTER_NAME ) );
@@ -44,10 +44,10 @@ void FilterSetupItem::init( )
setAction( DEFAULT_FILTER_ACTION );
//show number in column
- setText( ColNumber, QString("%1").arg( number ) );
+ setText( ColNumber, TQString("%1").arg( number ) );
}
-void FilterSetupItem::setName( QString name )
+void FilterSetupItem::setName( TQString name )
{
this->name = name;
@@ -55,7 +55,7 @@ void FilterSetupItem::setName( QString name )
setText( ColName, name );
}
-QString FilterSetupItem::getName( ) const
+TQString FilterSetupItem::getName( ) const
{
return name;
}
@@ -65,7 +65,7 @@ void FilterSetupItem::setNumber( uint number )
this->number = number;
//show number in column
- setText( ColNumber, QString("%1").arg( number ) );
+ setText( ColNumber, TQString("%1").arg( number ) );
}
void FilterSetupItem::setAction( int action )
@@ -93,8 +93,8 @@ void FilterSetupItem::setAction( int action )
void FilterSetupItem::save( )
{
//build group name
- QString group;
- group = QString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( number );
+ TQString group;
+ group = TQString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( number );
//first delete the group to clear it of old criteria entries
config->deleteGroup( group );
@@ -150,8 +150,8 @@ void FilterSetupItem::save( )
{
ctr++;
- config->writeEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( ctr ), (*it).source );
- config->writeEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), (*it).condition );
+ config->writeEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( ctr ), (*it).source );
+ config->writeEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), (*it).condition );
switch( (*it).source )
{
@@ -159,11 +159,11 @@ void FilterSetupItem::save( )
case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_TO :
case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SUBJECT :
case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_HEADER :
- case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_ACCOUNT : config->writeEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), (*it).txtValue );
- config->writeEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( ctr ), (*it).cs );
+ case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_ACCOUNT : config->writeEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), (*it).txtValue );
+ config->writeEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( ctr ), (*it).cs );
break;
- case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SIZE : config->writeEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), (*it).numValue );
+ case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SIZE : config->writeEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), (*it).numValue );
break;
}
}
@@ -196,7 +196,7 @@ void FilterSetupItem::setCriteriaList( FilterCriteriaList_Type list )
criteriaList = list;
}
-void FilterSetupItem::setMailBox( QString mailbox )
+void FilterSetupItem::setMailBox( TQString mailbox )
{
this->mailbox = mailbox;
@@ -214,12 +214,12 @@ int FilterSetupItem::getAction( ) const
return action;
}
-QString FilterSetupItem::getMailBox( ) const
+TQString FilterSetupItem::getMailBox( ) const
{
if( action == CONFIG_VALUE_FILTER_ACTION_MOVE )
return mailbox;
else
- return QString( "" );
+ return TQString( "" );
}
FilterCriteriaList_Type FilterSetupItem::getCriteriaList( ) const
@@ -232,7 +232,7 @@ uint FilterSetupItem::getNumber( ) const
return number;
}
-int FilterSetupItem::compare( QListViewItem * i, int col, bool ascending ) const
+int FilterSetupItem::compare( TQListViewItem * i, int col, bool ascending ) const
{
if( col == ColNumber )
{
@@ -245,7 +245,7 @@ int FilterSetupItem::compare( QListViewItem * i, int col, bool ascending ) const
void FilterSetupItem::updateActionColumn( )
{
- QString strAction; //filter action
+ TQString strAction; //filter action
//build action
switch( action )
@@ -260,13 +260,13 @@ void FilterSetupItem::updateActionColumn( )
}
//set text
- setText( ColAction, QString( " %1" ).arg( strAction ) );
+ setText( ColAction, TQString( " %1" ).arg( strAction ) );
}
void FilterSetupItem::load( )
{
//set group
- config->setGroup( QString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( number ) );
+ config->setGroup( TQString( "%1%2" ).arg( CONFIG_GROUP_FILTER ).arg( number ) );
//get name
setName( config->readEntry( CONFIG_ENTRY_FILTER_NAME, DEFAULT_FILTER_NAME ) );
@@ -290,7 +290,7 @@ void FilterSetupItem::load( )
switch( action )
{
case CONFIG_VALUE_FILTER_ACTION_MOVE : setMailBox( config->readEntry( CONFIG_ENTRY_FILTER_MOVE_MAILBOX, DEFAULT_FILTER_ACTION_MOVE_MAILBOX ) ); break;
- default : setMailBox( QString::null );
+ default : setMailBox( TQString::null );
}
//get number of criterias
@@ -301,7 +301,7 @@ void FilterSetupItem::load( )
{
struct FilterCriteria_Type crit;
- crit.source = config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_SOURCE );
+ crit.source = config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_SOURCE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_SOURCE );
if( crit.source != CONFIG_VALUE_FILTER_CRITERIA_SOURCE_FROM &&
crit.source != CONFIG_VALUE_FILTER_CRITERIA_SOURCE_TO &&
crit.source != CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SUBJECT &&
@@ -312,7 +312,7 @@ void FilterSetupItem::load( )
switch( crit.source )
{
- case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SIZE : crit.condition = config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), DEFAULT_FILTER_CRITERIA_COND_NUM );
+ case CONFIG_VALUE_FILTER_CRITERIA_SOURCE_SIZE : crit.condition = config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), DEFAULT_FILTER_CRITERIA_COND_NUM );
if( crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_EQUAL &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_NOT_EQUAL &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_GREATER &&
@@ -320,10 +320,10 @@ void FilterSetupItem::load( )
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_LESS &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_NUM_LESS_EQUAL )
crit.condition = DEFAULT_FILTER_CRITERIA_COND_NUM;
- crit.numValue = config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_SIZE );
+ crit.numValue = config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_SIZE );
break;
- default : crit.condition = config->readNumEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), DEFAULT_FILTER_CRITERIA_COND_TEXT );
+ default : crit.condition = config->readNumEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CONDITION ).arg( ctr ), DEFAULT_FILTER_CRITERIA_COND_TEXT );
if( crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_CONTAINS &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_NOT_CONTAINS &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_EQUALS &&
@@ -331,8 +331,8 @@ void FilterSetupItem::load( )
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_REGEXPR &&
crit.condition != CONFIG_VALUE_FILTER_CRITERIA_COND_TEXT_NOT_REGEXPR )
crit.condition = DEFAULT_FILTER_CRITERIA_COND_TEXT;
- crit.txtValue = config->readEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ) );
- crit.cs = config->readBoolEntry( QString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_CASE_SENSITIVE );
+ crit.txtValue = config->readEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_VALUE ).arg( ctr ) );
+ crit.cs = config->readBoolEntry( TQString( "%1%2" ).arg( CONFIG_ENTRY_FILTER_CRITERIA_CASESENSITIVE ).arg( ctr ), DEFAULT_FILTER_CRITERIA_CASE_SENSITIVE );
break;
}
diff --git a/kshowmail/kcmconfigs/filtersetupitem.h b/kshowmail/kcmconfigs/filtersetupitem.h
index 1d1bf02..1007ba5 100644
--- a/kshowmail/kcmconfigs/filtersetupitem.h
+++ b/kshowmail/kcmconfigs/filtersetupitem.h
@@ -13,11 +13,11 @@
#define FILTERSETUPITEM_H
//KDE headers
-#include <klistview.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdelistview.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
//KShowmail headers
#include "../constants.h"
@@ -29,7 +29,7 @@ using namespace Types;
* @brief This class is used in ConfigFilter to show the available filters in the list view and to store a filter setup.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class FilterSetupItem : public KListViewItem
+class FilterSetupItem : public TDEListViewItem
{
public:
@@ -43,14 +43,14 @@ class FilterSetupItem : public KListViewItem
* General Constructor
* @param parent the list view
*/
- FilterSetupItem( KListView* parent );
+ FilterSetupItem( TDEListView* parent );
/**
* Constructor
* @param parent the list view
* @param num filter number
*/
- FilterSetupItem( KListView* parent, uint num );
+ FilterSetupItem( TDEListView* parent, uint num );
/**
* Destructor
@@ -63,7 +63,7 @@ class FilterSetupItem : public KListViewItem
* @see name
* @see getName
*/
- void setName( QString name );
+ void setName( TQString name );
/**
* Returns the name of this filter.
@@ -71,7 +71,7 @@ class FilterSetupItem : public KListViewItem
* @see name
* @see setName
*/
- QString getName() const;
+ TQString getName() const;
/**
* Sets the filter number.
@@ -112,7 +112,7 @@ class FilterSetupItem : public KListViewItem
* @see setMailBox
* @see mailbox
*/
- void setMailBox( QString mailbox );
+ void setMailBox( TQString mailbox );
/**
* Returns the mailbox name of a move action if this action is selected. Otherwise it returns an empty string.
@@ -120,7 +120,7 @@ class FilterSetupItem : public KListViewItem
* @see setMailBox
* @see mailbox
*/
- QString getMailBox() const;
+ TQString getMailBox() const;
/**
* Sets the criteria linkage.
@@ -164,14 +164,14 @@ class FilterSetupItem : public KListViewItem
void save();
/**
- * Reimplemantation of QListViewItem::compare.
+ * Reimplemantation of TQListViewItem::compare.
* Compares this list view item to i using the column col in ascending order. Reutrns <0 if this item is less than i,
* 0 if they are equal and >0 if this item is greater than i. The parameter ascneding will be ignored.
* @param i pointer to the second view item
* @param col number of the sorted column
* @param ascending ignored
*/
- virtual int compare( QListViewItem* i, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
/**
* Reads the settings from the config file.
@@ -185,12 +185,12 @@ class FilterSetupItem : public KListViewItem
/**
* filter name
*/
- QString name;
+ TQString name;
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* List of filter criterias.
@@ -206,7 +206,7 @@ class FilterSetupItem : public KListViewItem
/**
* Contains the mailbox name if the move action is selected.
*/
- QString mailbox;
+ TQString mailbox;
/**
* Filter Number.
diff --git a/kshowmail/kcmconfigs/kshowmailconfigaccounts.desktop b/kshowmail/kcmconfigs/kshowmailconfigaccounts.desktop
index e8da1f9..ff8be06 100644
--- a/kshowmail/kcmconfigs/kshowmailconfigaccounts.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfigaccounts.desktop
@@ -8,13 +8,13 @@ Comment=Accounts
Comment[de]=Konten
Comment[es]=Cuentas
Icon=network
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfigaccounts
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfigaccounts
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=5
-X-KDE-ParentApp=kshowmail
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfigaccounts
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfigaccounts
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=5
+X-TDE-ParentApp=kshowmail
diff --git a/kshowmail/kcmconfigs/kshowmailconfigactions.desktop b/kshowmail/kcmconfigs/kshowmailconfigactions.desktop
index a925df8..63ce880 100644
--- a/kshowmail/kcmconfigs/kshowmailconfigactions.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfigactions.desktop
@@ -8,13 +8,13 @@ Comment=actions
Comment[de]=Aktionen
Comment[es]=Acciones
Icon=launch
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfigactions
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfigactions
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=2
-X-KDE-ParentApp=kshowmail
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfigactions
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfigactions
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=2
+X-TDE-ParentApp=kshowmail
diff --git a/kshowmail/kcmconfigs/kshowmailconfigdisplay.desktop b/kshowmail/kcmconfigs/kshowmailconfigdisplay.desktop
index ac5e02b..aee3fce 100644
--- a/kshowmail/kcmconfigs/kshowmailconfigdisplay.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfigdisplay.desktop
@@ -8,12 +8,12 @@ Comment=Display Options
Comment[de]=Erscheinungsbild
Comment[es]=Opciones de visualización
Icon=looknfeel
-ServiceTypes=KCModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfigdisplay
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfigdisplay
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=3
-X-KDE-ParentApp=kshowmail \ No newline at end of file
+ServiceTypes=TDECModule
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfigdisplay
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfigdisplay
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=3
+X-TDE-ParentApp=kshowmail \ No newline at end of file
diff --git a/kshowmail/kcmconfigs/kshowmailconfigfilter.desktop b/kshowmail/kcmconfigs/kshowmailconfigfilter.desktop
index cd6b801..6e7d84b 100644
--- a/kshowmail/kcmconfigs/kshowmailconfigfilter.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfigfilter.desktop
@@ -7,13 +7,13 @@ Comment=Filter
Comment[de]=Filter
Comment[es]=Filtro
Icon=filter
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfigfilter
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfigfilter
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=6
-X-KDE-ParentApp=kshowmail
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfigfilter
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfigfilter
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=6
+X-TDE-ParentApp=kshowmail
diff --git a/kshowmail/kcmconfigs/kshowmailconfiggeneral.desktop b/kshowmail/kcmconfigs/kshowmailconfiggeneral.desktop
index 1f4db6d..795150c 100644
--- a/kshowmail/kcmconfigs/kshowmailconfiggeneral.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfiggeneral.desktop
@@ -8,12 +8,12 @@ Comment=General Options
Comment[de]=Allgemeine Einstellungen
Comment[es]=Opciones generales
Icon=exec
-ServiceTypes=KCModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfiggeneral
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfiggeneral
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=4
-X-KDE-ParentApp=kshowmail \ No newline at end of file
+ServiceTypes=TDECModule
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfiggeneral
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfiggeneral
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=4
+X-TDE-ParentApp=kshowmail \ No newline at end of file
diff --git a/kshowmail/kcmconfigs/kshowmailconfiglog.desktop b/kshowmail/kcmconfigs/kshowmailconfiglog.desktop
index 4a5dc5f..1917eb5 100644
--- a/kshowmail/kcmconfigs/kshowmailconfiglog.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfiglog.desktop
@@ -8,9 +8,9 @@ Comment=Log
Comment[de]=Log
Comment[es]=Registro
Icon=kedit
-ServiceTypes=KCModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfiglog
-X-KDE-FactoryName=kshowmailconfiglog
-X-KDE-Weight=7
-X-KDE-ParentApp=kshowmail
+ServiceTypes=TDECModule
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfiglog
+X-TDE-FactoryName=kshowmailconfiglog
+X-TDE-Weight=7
+X-TDE-ParentApp=kshowmail
diff --git a/kshowmail/kcmconfigs/kshowmailconfigspamcheck.desktop b/kshowmail/kcmconfigs/kshowmailconfigspamcheck.desktop
index 5f6cb3b..58a57ff 100644
--- a/kshowmail/kcmconfigs/kshowmailconfigspamcheck.desktop
+++ b/kshowmail/kcmconfigs/kshowmailconfigspamcheck.desktop
@@ -7,14 +7,14 @@ Comment=Checking for Spam
Comment[de]=Prüfung auf Spam
Comment[es]=Analizar el spam
Icon=kfind
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kshowmailconfigspamcheck
-X-KDE-CfgDlgHierarchy=
-X-KDE-FactoryName=kshowmailconfigspamcheck
-X-KDE-IsHiddenByDefault=
-X-KDE-RootOnly=
-X-KDE-Weight=6
-X-KDE-ParentApp=kshowmail
+X-TDE-ModuleType=Library
+X-TDE-Library=kshowmailconfigspamcheck
+X-TDE-CfgDlgHierarchy=
+X-TDE-FactoryName=kshowmailconfigspamcheck
+X-TDE-IsHiddenByDefault=
+X-TDE-RootOnly=
+X-TDE-Weight=6
+X-TDE-ParentApp=kshowmail
diff --git a/kshowmail/kcmconfigs/mailboxwizard.cpp b/kshowmail/kcmconfigs/mailboxwizard.cpp
index d6ab904..6c8a2b9 100644
--- a/kshowmail/kcmconfigs/mailboxwizard.cpp
+++ b/kshowmail/kcmconfigs/mailboxwizard.cpp
@@ -11,21 +11,21 @@
//
#include "mailboxwizard.h"
-MailBoxWizard::MailBoxWizard( QWidget* parent, const char* name )
- : QWizard( parent, name, true )
+MailBoxWizard::MailBoxWizard( TQWidget* parent, const char* name )
+ : TQWizard( parent, name, true )
{
//this is page one
//in this the user can chosse his mail directory
//----------------------------------------------
- QWidget* page1 = new QWidget( this, "page1" );
- QHBoxLayout* layMain1 = new QHBoxLayout( page1, 0, 10 );
+ TQWidget* page1 = new TQWidget( this, "page1" );
+ TQHBoxLayout* layMain1 = new TQHBoxLayout( page1, 0, 10 );
txtMailDir = new KLineEdit( page1, "txtMailDir" );
layMain1->addWidget( txtMailDir );
- btnMailDir = new KPushButton( KGuiItem( QString(), QString( "folder" ), i18n( "Press to choose the mail directory" ), i18n( "Press to choose the mail directory" ) ), page1, "btnMailDir" );
- btnMailDir->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ btnMailDir = new KPushButton( KGuiItem( TQString(), TQString( "folder" ), i18n( "Press to choose the mail directory" ), i18n( "Press to choose the mail directory" ) ), page1, "btnMailDir" );
+ btnMailDir->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
layMain1->addWidget( btnMailDir );
connect( btnMailDir, SIGNAL( clicked() ), this, SLOT( slotOpenDirDialog() ) );
@@ -36,10 +36,10 @@ MailBoxWizard::MailBoxWizard( QWidget* parent, const char* name )
//this is page two
//in this the user can choose the mailbox
//---------------------------------------
- QWidget* page2 = new QWidget( this, "page2" );
- QHBoxLayout* layMain2 = new QHBoxLayout( page2, 0, 10 );
+ TQWidget* page2 = new TQWidget( this, "page2" );
+ TQHBoxLayout* layMain2 = new TQHBoxLayout( page2, 0, 10 );
- lstMailboxes = new KListView( page2, "lstMailboxes" );
+ lstMailboxes = new TDEListView( page2, "lstMailboxes" );
lstMailboxes->addColumn( "Mailbox" );
lstMailboxes->setRootIsDecorated( true );
layMain2->addWidget( lstMailboxes );
@@ -48,7 +48,7 @@ MailBoxWizard::MailBoxWizard( QWidget* parent, const char* name )
addPage( page2, title2 );
setFinishEnabled( page2, true );
- connect( this, SIGNAL( selected( const QString& ) ), this, SLOT( slotPageChanged( const QString& ) ) );
+ connect( this, SIGNAL( selected( const TQString& ) ), this, SLOT( slotPageChanged( const TQString& ) ) );
}
@@ -59,19 +59,19 @@ MailBoxWizard::~MailBoxWizard()
void MailBoxWizard::slotOpenDirDialog( )
{
//save old path
- QString oldPath = txtMailDir->text();
+ TQString oldPath = txtMailDir->text();
//get new path
- QString path = KFileDialog::getExistingDirectory( oldPath, this, i18n( "Choose the mailbox directory") );
+ TQString path = KFileDialog::getExistingDirectory( oldPath, this, i18n( "Choose the mailbox directory") );
//put new or old path in the edit line
- if( path == QString::null )
+ if( path == TQString::null )
txtMailDir->setText( oldPath );
else
txtMailDir->setText( path );
}
-void MailBoxWizard::slotPageChanged( const QString& pageTitle )
+void MailBoxWizard::slotPageChanged( const TQString& pageTitle )
{
//just we looking for mailboxes if the page 2 was opened
if( pageTitle == title2 )
@@ -80,16 +80,16 @@ void MailBoxWizard::slotPageChanged( const QString& pageTitle )
lstMailboxes->clear();
//create an directory object to browse the given directory
- QDir mailDir( txtMailDir->text() );
+ TQDir mailDir( txtMailDir->text() );
if( mailDir.isReadable() ) //is the dir readable?
{
//get a list of all entries in this directory
- const QStringList entries = mailDir.entryList( QDir::Dirs | QDir::Readable | QDir::Writable | QDir::Hidden, QDir::Name | QDir::IgnoreCase | QDir::LocaleAware );
+ const TQStringList entries = mailDir.entryList( TQDir::Dirs | TQDir::Readable | TQDir::Writable | TQDir::Hidden, TQDir::Name | TQDir::IgnoreCase | TQDir::LocaleAware );
- for( QStringList::const_iterator it = entries.begin(); it != entries.end(); ++it )
+ for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it )
{
//add an entry to the mailbox list
- QDir newMailDir( mailDir );
+ TQDir newMailDir( mailDir );
newMailDir.cd( (*it) );
if( (*it) != ".." && (*it) != "." && isMailDir( newMailDir ) )
addMailBoxListItem( *it, mailDir );
@@ -99,10 +99,10 @@ void MailBoxWizard::slotPageChanged( const QString& pageTitle )
}
-bool MailBoxWizard::isMailDir( const QDir & path )
+bool MailBoxWizard::isMailDir( const TQDir & path )
{
//get a list of all subdirectories in this directory
- const QStringList entries = path.entryList( QDir::Dirs | QDir::Readable | QDir::Writable | QDir::Hidden, QDir::Name | QDir::IgnoreCase | QDir::LocaleAware );
+ const TQStringList entries = path.entryList( TQDir::Dirs | TQDir::Readable | TQDir::Writable | TQDir::Hidden, TQDir::Name | TQDir::IgnoreCase | TQDir::LocaleAware );
//a maildir folder must contains the folders "cur", "new" and "tmp"
bool curFound = false;
@@ -110,7 +110,7 @@ bool MailBoxWizard::isMailDir( const QDir & path )
bool tmpFound = false;
//iterate over all directories and look for the three necessary dirs
- QStringList::const_iterator it = entries.begin();
+ TQStringList::const_iterator it = entries.begin();
while( it != entries.end() && !( curFound && newFound && tmpFound ) )
{
if( *it == "tmp" )
@@ -126,10 +126,10 @@ bool MailBoxWizard::isMailDir( const QDir & path )
return curFound && newFound && tmpFound;
}
-void MailBoxWizard::addMailBoxListItem( QString boxname, QDir path )
+void MailBoxWizard::addMailBoxListItem( TQString boxname, TQDir path )
{
//translate some default mailboxes
- QString boxnameTrans;
+ TQString boxnameTrans;
if( boxname.lower() == "inbox" )
boxnameTrans = i18n( "Inbox" );
else if( boxname.lower() == "outbox" )
@@ -150,11 +150,11 @@ void MailBoxWizard::addMailBoxListItem( QString boxname, QDir path )
}
-QString MailBoxWizard::getPath( )
+TQString MailBoxWizard::getPath( )
{
MailBoxWizardListItem* item = (MailBoxWizardListItem*)lstMailboxes->selectedItem();
- QString path = QString::null;
+ TQString path = TQString::null;
if( item != NULL )
path = item->getPath();
diff --git a/kshowmail/kcmconfigs/mailboxwizard.h b/kshowmail/kcmconfigs/mailboxwizard.h
index 2c32b7a..7332cf4 100644
--- a/kshowmail/kcmconfigs/mailboxwizard.h
+++ b/kshowmail/kcmconfigs/mailboxwizard.h
@@ -15,23 +15,23 @@
//C-headers
#include <stdlib.h>
-//Qt headers
-#include <qwizard.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qdir.h>
-#include <qregexp.h>
-#include <qfileinfo.h>
-#include <qmap.h>
+//TQt headers
+#include <ntqwizard.h>
+#include <ntqwidget.h>
+#include <ntqlayout.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
+#include <ntqfileinfo.h>
+#include <ntqmap.h>
//KDE headers
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kpushbutton.h>
-#include <kfiledialog.h>
-#include <klistview.h>
+#include <tdefiledialog.h>
+#include <tdelistview.h>
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
//Kshowmail headers
@@ -42,7 +42,7 @@
* Wizard to configure the mailbox to which a filteres mail shall be moved.
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class MailBoxWizard : public QWizard
+class MailBoxWizard : public TQWizard
{
Q_OBJECT
@@ -52,7 +52,7 @@ class MailBoxWizard : public QWizard
/**
* Constructor
*/
- MailBoxWizard( QWidget* parent = 0, const char* name = 0 );
+ MailBoxWizard( TQWidget* parent = 0, const char* name = 0 );
/**
* Destructor
@@ -63,7 +63,7 @@ class MailBoxWizard : public QWizard
* Returns the absolute path of the selected mailbox.
* @return the path
*/
- QString getPath();
+ TQString getPath();
private:
@@ -80,33 +80,33 @@ class MailBoxWizard : public QWizard
/**
* This view shows the available mailboxes in the selected directory
*/
- KListView* lstMailboxes;
+ TDEListView* lstMailboxes;
/**
* Title of page 1.
* Set by constructor
*/
- QString title1;
+ TQString title1;
/**
* Title of page 2.
* Set by Constructor.
*/
- QString title2;
+ TQString title2;
/**
* Returns whether the given directory is a maildir directory
* @param path the directory for test
* @return TRUE - directory is a maildir directory
*/
- bool isMailDir( const QDir& path );
+ bool isMailDir( const TQDir& path );
/**
* Adds a new mailbox list view item to the mailbox list or to a given parent item.
* @param boxname name of the mailbox
* @param path path to the directory of this mailbox
*/
- void addMailBoxListItem( QString boxname, QDir path );
+ void addMailBoxListItem( TQString boxname, TQDir path );
@@ -123,7 +123,7 @@ class MailBoxWizard : public QWizard
* Searchs for mailboxes inside the path typed in page1.
* @param pageTitle title of the selected page
*/
- void slotPageChanged( const QString& pageTitle );
+ void slotPageChanged( const TQString& pageTitle );
};
diff --git a/kshowmail/kcmconfigs/mailboxwizardlistitem.cpp b/kshowmail/kcmconfigs/mailboxwizardlistitem.cpp
index 4afdc2a..62bff9b 100644
--- a/kshowmail/kcmconfigs/mailboxwizardlistitem.cpp
+++ b/kshowmail/kcmconfigs/mailboxwizardlistitem.cpp
@@ -15,13 +15,13 @@ MailBoxWizardListItem::~MailBoxWizardListItem()
{
}
-MailBoxWizardListItem::MailBoxWizardListItem( QListView* parent, QString label, QString path )
- : KListViewItem( parent, label )
+MailBoxWizardListItem::MailBoxWizardListItem( TQListView* parent, TQString label, TQString path )
+ : TDEListViewItem( parent, label )
{
this->path = path;
}
-QString MailBoxWizardListItem::getPath( )
+TQString MailBoxWizardListItem::getPath( )
{
return path;
}
diff --git a/kshowmail/kcmconfigs/mailboxwizardlistitem.h b/kshowmail/kcmconfigs/mailboxwizardlistitem.h
index 603a9c8..13be613 100644
--- a/kshowmail/kcmconfigs/mailboxwizardlistitem.h
+++ b/kshowmail/kcmconfigs/mailboxwizardlistitem.h
@@ -12,17 +12,17 @@
#ifndef MAILBOXWIZARDLISTITEM_H
#define MAILBOXWIZARDLISTITEM_H
-//Qt-Headers
-#include <qlistview.h>
+//TQt-Headers
+#include <ntqlistview.h>
//KDE-Headers
-#include <klistview.h>
+#include <tdelistview.h>
/**
* This is a list item in the mailbox list of the mailbox wizard
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
*/
-class MailBoxWizardListItem : public KListViewItem
+class MailBoxWizardListItem : public TDEListViewItem
{
public:
@@ -34,7 +34,7 @@ class MailBoxWizardListItem : public KListViewItem
* @param label column content
* @param path the absolute path to this mailbox
*/
- MailBoxWizardListItem( QListView* parent, QString label, QString path );
+ MailBoxWizardListItem( TQListView* parent, TQString label, TQString path );
/**
* Destructor
@@ -45,14 +45,14 @@ class MailBoxWizardListItem : public KListViewItem
* Returns the path to this mailbox.
* @return path to this mailbox
*/
- QString getPath();
+ TQString getPath();
private:
/**
* The path to this mailbox
*/
- QString path;
+ TQString path;
diff --git a/kshowmail/kcmconfigs/senderlistdialog.cpp b/kshowmail/kcmconfigs/senderlistdialog.cpp
index c30804c..9406bac 100644
--- a/kshowmail/kcmconfigs/senderlistdialog.cpp
+++ b/kshowmail/kcmconfigs/senderlistdialog.cpp
@@ -11,14 +11,14 @@
//
#include "senderlistdialog.h"
-SenderListDialog::SenderListDialog(QWidget *parent, ListType list, const char *name)
- : KDialogBase( parent, name, true, QString::null, Ok|Cancel, Ok, true )
+SenderListDialog::SenderListDialog(TQWidget *parent, ListType list, const char *name)
+ : KDialogBase( parent, name, true, TQString::null, Ok|Cancel, Ok, true )
{
//save list type
this->list = list;
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//set caption
if( list == White )
@@ -30,39 +30,39 @@ SenderListDialog::SenderListDialog(QWidget *parent, ListType list, const char *n
//---------
//main widget and layout
- QWidget* wdgMain = new QWidget( this );
+ TQWidget* wdgMain = new TQWidget( this );
setMainWidget( wdgMain );
- QVBoxLayout* layMain = new QVBoxLayout( wdgMain, 0, spacingHint() );
+ TQVBoxLayout* layMain = new TQVBoxLayout( wdgMain, 0, spacingHint() );
//edit frame
editFrame = new KEditListBox( wdgMain, "editFrame", true, KEditListBox::Add | KEditListBox::Remove );
editFrame->setTitle( i18n( "List" ) );
if( list == White )
- QToolTip::add( editFrame->listBox(), i18n( "A mail whose sender is listed here will pass the filter.\nA mail will be accepted, if its From line incloses a list entry.\nE.g. a line of\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de> is accepted by the entries\nUlrich Weigelt\nulrich.weigelt@gmx.de\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de>" ) );
+ TQToolTip::add( editFrame->listBox(), i18n( "A mail whose sender is listed here will pass the filter.\nA mail will be accepted, if its From line incloses a list entry.\nE.g. a line of\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de> is accepted by the entries\nUlrich Weigelt\nulrich.weigelt@gmx.de\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de>" ) );
else
- QToolTip::add( editFrame->listBox(), i18n( "A mail whose sender is listed here will be hold up by the filter.\nA mail will be stopped, if its From line incloses a list entry.\nE.g. a line of\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de> is filtered by the entries\nUlrich Weigelt\nulrich.weigelt@gmx.de\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de>" ) );
+ TQToolTip::add( editFrame->listBox(), i18n( "A mail whose sender is listed here will be hold up by the filter.\nA mail will be stopped, if its From line incloses a list entry.\nE.g. a line of\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de> is filtered by the entries\nUlrich Weigelt\nulrich.weigelt@gmx.de\n\"Ulrich Weigelt\" <ulrich.weigelt@gmx.de>" ) );
layMain->addWidget( editFrame );
connect( editFrame->addButton(), SIGNAL( clicked() ), this, SLOT( slotSort() ) );
- connect( editFrame->lineEdit(), SIGNAL( returnPressed( const QString & ) ), this, SLOT( slotSort() ) );
+ connect( editFrame->lineEdit(), SIGNAL( returnPressed( const TQString & ) ), this, SLOT( slotSort() ) );
//this radio buttons we just need in the blacklist
if( list == Black )
{
- QGroupBox* gboxAction = new QGroupBox( 0, Qt::Horizontal, i18n( "Action" ), wdgMain, "gboxAction" );
- QHBoxLayout* layAction = new QHBoxLayout( gboxAction->layout(), 10 );
+ TQGroupBox* gboxAction = new TQGroupBox( 0, TQt::Horizontal, i18n( "Action" ), wdgMain, "gboxAction" );
+ TQHBoxLayout* layAction = new TQHBoxLayout( gboxAction->layout(), 10 );
layMain->addWidget( gboxAction );
- grpAction = new QButtonGroup( NULL, "grpAction" );
- QRadioButton* btnDelete = new QRadioButton( i18n( "Delete"), gboxAction, "btnDelete" );
- QRadioButton* btnMark = new QRadioButton( i18n( "Mark" ), gboxAction, "btnMark" );
+ grpAction = new TQButtonGroup( NULL, "grpAction" );
+ TQRadioButton* btnDelete = new TQRadioButton( i18n( "Delete"), gboxAction, "btnDelete" );
+ TQRadioButton* btnMark = new TQRadioButton( i18n( "Mark" ), gboxAction, "btnMark" );
grpAction->insert( btnDelete, ID_BUTTON_FILTER_SENDERLIST_DELETE );
grpAction->insert( btnMark, ID_BUTTON_FILTER_SENDERLIST_MARK );
- QToolTip::add( btnDelete, i18n( "The mails will be deleted." ) );
- QToolTip::add( btnMark, i18n( "The mails will be marked." ) );
+ TQToolTip::add( btnDelete, i18n( "The mails will be deleted." ) );
+ TQToolTip::add( btnMark, i18n( "The mails will be marked." ) );
layAction->addWidget( btnDelete );
layAction->addWidget( btnMark );
diff --git a/kshowmail/kcmconfigs/senderlistdialog.h b/kshowmail/kcmconfigs/senderlistdialog.h
index eeb0661..9ba0e4c 100644
--- a/kshowmail/kcmconfigs/senderlistdialog.h
+++ b/kshowmail/kcmconfigs/senderlistdialog.h
@@ -12,20 +12,20 @@
#ifndef SENDERLISTDIALOG_H
#define SENDERLISTDIALOG_H
-//Qt headers
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqtooltip.h>
+#include <ntqradiobutton.h>
+#include <ntqbuttongroup.h>
+#include <ntqpushbutton.h>
//KDE headers
#include <kdialogbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
//KShowmail headers
#include "../constants.h"
@@ -56,7 +56,7 @@ class SenderListDialog : public KDialogBase
* @param list list which shall be opened
* @param name widget name
*/
- SenderListDialog( QWidget *parent = 0, ListType list = Black, const char *name = 0 );
+ SenderListDialog( TQWidget *parent = 0, ListType list = Black, const char *name = 0 );
/**
* Destructor
@@ -73,7 +73,7 @@ class SenderListDialog : public KDialogBase
/**
* Application Config Object
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Edit Frame
@@ -83,7 +83,7 @@ class SenderListDialog : public KDialogBase
/**
* Combines the action radio buttons for the blacklist.
*/
- QButtonGroup* grpAction;
+ TQButtonGroup* grpAction;
/**
* Reads the entries for the dialog from the config file fill them in it.
diff --git a/kshowmail/kcmconfigs/kwalletaccess.cpp b/kshowmail/kcmconfigs/tdewalletaccess.cpp
index 20dccc6..1f48e1c 100644
--- a/kshowmail/kcmconfigs/kwalletaccess.cpp
+++ b/kshowmail/kcmconfigs/tdewalletaccess.cpp
@@ -1,15 +1,15 @@
//
-// C++ Implementation: kwalletaccess
+// C++ Implementation: tdewalletaccess
//
// Author: Ulrich Weigelt <ulrich.weigelt@gmx.de>, (C) 2007
//
// Copyright: See COPYING file that comes with this distribution
//
//
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
-bool KWalletAccess::savePassword( const QString & account, const QString & password )
+bool KWalletAccess::savePassword( const TQString & account, const TQString & password )
{
//check for enabled KWallet
if( !KWallet::Wallet::isEnabled() )
@@ -19,8 +19,8 @@ bool KWalletAccess::savePassword( const QString & account, const QString & passw
}
//get wallet name for network data
- QString name = KWallet::Wallet::NetworkWallet();
- if( name == "" || name == QString::null )
+ TQString name = KWallet::Wallet::NetworkWallet();
+ if( name == "" || name == TQString::null )
{
KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
return false;
@@ -78,21 +78,21 @@ bool KWalletAccess::savePassword( const QString & account, const QString & passw
return true;
}
-QString KWalletAccess::getPassword( const QString & account )
+TQString KWalletAccess::getPassword( const TQString & account )
{
//check for enabled KWallet
if( !KWallet::Wallet::isEnabled() )
{
KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
- return QString::null;
+ return TQString::null;
}
//get wallet name for network data
- QString name = KWallet::Wallet::NetworkWallet();
- if( name == "" || name == QString::null )
+ TQString name = KWallet::Wallet::NetworkWallet();
+ if( name == "" || name == TQString::null )
{
KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//open wallet
@@ -112,7 +112,7 @@ QString KWalletAccess::getPassword( const QString & account )
if( wallet == NULL )
{
KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//set folder
@@ -120,17 +120,17 @@ QString KWalletAccess::getPassword( const QString & account )
if( !setFolderSuccess )
{
KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//read password
- QString password;
+ TQString password;
int readPasswordSuccess = wallet->readPassword( account, password );
if( readPasswordSuccess != 0 )
{
KMessageBox::error( NULL, i18n( "Could not get password of account %1 from KWallet." ).arg( account) );
- return QString::null;
+ return TQString::null;
}
return password;
diff --git a/kshowmail/kcmconfigs/kwalletaccess.h b/kshowmail/kcmconfigs/tdewalletaccess.h
index 8e9c537..905abd9 100644
--- a/kshowmail/kcmconfigs/kwalletaccess.h
+++ b/kshowmail/kcmconfigs/tdewalletaccess.h
@@ -1,5 +1,5 @@
//
-// C++ Interface: kwalletaccess
+// C++ Interface: tdewalletaccess
//
// Author: Ulrich Weigelt <ulrich.weigelt@gmx.de>, (C) 2007
//
@@ -9,14 +9,14 @@
#ifndef KWALLETACCESS_H
#define KWALLETACCESS_H
-//Qt headers
-#include <qstring.h>
+//TQt headers
+#include <ntqstring.h>
//KDE headers
-#include <kwallet.h>
-#include <kmessagebox.h>
+#include <tdewallet.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
/**
* @brief Provides routines to save and read passwords using KWallet.
@@ -32,14 +32,14 @@ namespace KWalletAccess
* @return TRUE - password successfully saved
* @return FALSE - password could not be saved
*/
- bool savePassword( const QString& account, const QString& password );
+ bool savePassword( const TQString& account, const TQString& password );
/**
* Returns the password of the given account.
* @param account account name
- * @return the password or QString::null, if the sought password is not stored in KWallet.
+ * @return the password or TQString::null, if the sought password is not stored in KWallet.
*/
- QString getPassword( const QString& account );
+ TQString getPassword( const TQString& account );
}
#endif
diff --git a/kshowmail/kfeedback.cpp b/kshowmail/kfeedback.cpp
index daadfe8..7a9a7fb 100644
--- a/kshowmail/kfeedback.cpp
+++ b/kshowmail/kfeedback.cpp
@@ -13,28 +13,28 @@
*/
-#include <qheader.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qmultilineedit.h>
-#include <qhbox.h>
-
-#include <kglobal.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <ntqheader.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqmultilineedit.h>
+#include <ntqhbox.h>
+
+#include <tdeglobal.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kiconloader.h>
#include <kurl.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kfeedback.h"
-KFeedbackDialog::KFeedbackDialog( const QString & feedbackMailAddress, const QString & helpTopic )
+KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, const TQString & helpTopic )
: KDialogBase( Plain, i18n( "Feedback" ), Apply | ( helpTopic.isEmpty() ? Cancel : Cancel | Help ), Apply )
{
- QVBoxLayout * layout = new QVBoxLayout( plainPage(), 0, spacingHint() );
+ TQVBoxLayout * layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
// setButtonApplyText( i18n( "&Mail this..." ) ); deprecated
setButtonApply(KGuiItem (i18n( "&Mail this..." )));
@@ -77,16 +77,16 @@ KFeedbackDialog::checkSendButton()
-KFeedbackForm::KFeedbackForm( const QString & feedbackMailAddress,
- QWidget * parent )
- : QVBox( parent )
+KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
+ TQWidget * parent )
+ : TQVBox( parent )
, _feedbackMailAddress( feedbackMailAddress )
{
//
// Explanation above the question list
//
- QLabel * label = new QLabel( i18n( "<p><b>Please tell us your opinion about this program.</b></p>"
+ TQLabel * label = new TQLabel( i18n( "<p><b>Please tell us your opinion about this program.</b></p>"
"<p>You will be able to review everything in your mailer "
"before any mail is sent.<br>"
"Nothing will be sent behind your back.</p>"
@@ -106,39 +106,39 @@ KFeedbackForm::KFeedbackForm( const QString & feedbackMailAddress,
// Explanation below the question list
//
- QHBox * hbox = new QHBox( this );
+ TQHBox * hbox = new TQHBox( this );
CHECK_PTR( hbox );
- QSizePolicy pol( QSizePolicy::Fixed, QSizePolicy::Fixed ); // hor / vert
+ TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert
- label = new QLabel( i18n( "Questions marked with " ), hbox );
+ label = new TQLabel( i18n( "Questions marked with " ), hbox );
CHECK_PTR( label );
label->setSizePolicy( pol );
- label = new QLabel( hbox );
+ label = new TQLabel( hbox );
CHECK_PTR( label );
- label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
label->setSizePolicy( pol );
- label = new QLabel( i18n( " must be answered before a mail can be sent.") , hbox );
+ label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
CHECK_PTR( label );
label->setSizePolicy( pol );
- new QWidget( hbox ); // Fill any leftover space to the right.
+ new TQWidget( hbox ); // Fill any leftover space to the right.
//
// Free-text comment field
//
- label = new QLabel( "\n" + i18n( "&Additional comments:" ), this ); CHECK_PTR( label );
- _comment = new QMultiLineEdit( this ); CHECK_PTR( _comment );
+ label = new TQLabel( "\n" + i18n( "&Additional comments:" ), this ); CHECK_PTR( label );
+ _comment = new TQMultiLineEdit( this ); CHECK_PTR( _comment );
label->setBuddy( _comment );
-#if (QT_VERSION < 300)
+#if (TQT_VERSION < 300)
_comment->setFixedVisibleLines( 5 );
#endif
- _comment->setWordWrap( QMultiLineEdit::FixedColumnWidth );
+ _comment->setWordWrap( TQMultiLineEdit::FixedColumnWidth );
_comment->setWrapColumnOrWidth( 70 );
}
@@ -156,9 +156,9 @@ KFeedbackForm::sendMail()
// Build mail subject
//
- QString subject;
+ TQString subject;
- const KAboutData * aboutData = KGlobal::instance()->aboutData();
+ const TDEAboutData * aboutData = TDEGlobal::instance()->aboutData();
if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version();
@@ -172,7 +172,7 @@ KFeedbackForm::sendMail()
// Build mail body
//
- QString body = subject + "\n\n"
+ TQString body = subject + "\n\n"
+ formatComment()
+ _questionList->result();
@@ -211,10 +211,10 @@ KFeedbackForm::slotCheckComplete()
}
-QString
+TQString
KFeedbackForm::formatComment()
{
- QString result = _comment->text();
+ TQString result = _comment->text();
if ( ! result.isEmpty() )
{
@@ -236,8 +236,8 @@ KFeedbackForm::readyToSend()
-KFeedbackQuestionList::KFeedbackQuestionList( QWidget *parent )
- : QListView( parent )
+KFeedbackQuestionList::KFeedbackQuestionList( TQWidget *parent )
+ : TQListView( parent )
{
addColumn( "" );
header()->hide();
@@ -267,9 +267,9 @@ KFeedbackQuestionList::isComplete()
}
-QString KFeedbackQuestionList::result()
+TQString KFeedbackQuestionList::result()
{
- QString res;
+ TQString res;
KFeedbackQuestion * question = firstQuestion();
while ( question )
@@ -279,14 +279,14 @@ QString KFeedbackQuestionList::result()
question = question->nextQuestion();
}
res += "Compiled on KDE version: ";
- res += KDE_VERSION_STRING;
+ res += TDE_VERSION_STRING;
return res;
}
-KFeedbackQuestion* KFeedbackQuestionList::addQuestion( const QString & text,
- const QString & id,
+KFeedbackQuestion* KFeedbackQuestionList::addQuestion( const TQString & text,
+ const TQString & id,
bool exclusiveAnswer,
bool required )
{
@@ -300,8 +300,8 @@ KFeedbackQuestion* KFeedbackQuestionList::addQuestion( const QString & text,
void
-KFeedbackQuestionList::addYesNoQuestion( const QString & text,
- const QString & id,
+KFeedbackQuestionList::addYesNoQuestion( const TQString & text,
+ const TQString & id,
bool required )
{
@@ -334,19 +334,19 @@ KFeedbackQuestionList::questionAdded( KFeedbackQuestion * question)
static int nextNo = 0;
KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
- const QString & text,
- const QString & id,
+ const TQString & text,
+ const TQString & id,
bool exclusiveAnswer,
bool required,
bool open )
- : QCheckListItem( parent, text )
+ : TQCheckListItem( parent, text )
, _id( id )
, _exclusiveAnswer( exclusiveAnswer )
, _required( required )
{
if ( required )
{
- setPixmap( 0, KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
}
setOpen( open );
@@ -357,8 +357,8 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
void
-KFeedbackQuestion::addAnswer( const QString & text,
- const QString & id )
+KFeedbackQuestion::addAnswer( const TQString & text,
+ const TQString & id )
{
new KFeedbackAnswer( this, text, id, _exclusiveAnswer );
}
@@ -381,7 +381,7 @@ KFeedbackQuestion::isAnswered()
/**
* If this question requires an exclusive answer, exactly one of them
* should be checked. We don't need to bother about more than one being
- * checked here - QListView does that for us.
+ * checked here - TQListView does that for us.
**/
KFeedbackAnswer *answer = firstAnswer();
@@ -398,10 +398,10 @@ KFeedbackQuestion::isAnswered()
}
-QString
+TQString
KFeedbackQuestion::result()
{
- QString res;
+ TQString res;
int answers = 0;
KFeedbackAnswer *answer = firstAnswer();
@@ -426,17 +426,17 @@ KFeedbackQuestion::result()
}
-QString
+TQString
KFeedbackQuestion::text()
{
- return QCheckListItem::text(0);
+ return TQCheckListItem::text(0);
}
-QString
+TQString
KFeedbackQuestion::key( int, bool ) const
{
- QString no;
+ TQString no;
no.sprintf( "%08d", _no );
return no;
@@ -456,31 +456,31 @@ KFeedbackQuestion::questionList() const
KFeedbackAnswer::KFeedbackAnswer( KFeedbackQuestion * parent,
- const QString & text,
- const QString & id,
+ const TQString & text,
+ const TQString & id,
bool exclusive )
- : QCheckListItem( parent,
+ : TQCheckListItem( parent,
text,
exclusive
- ? QCheckListItem::RadioButton
- : QCheckListItem::CheckBox )
+ ? TQCheckListItem::RadioButton
+ : TQCheckListItem::CheckBox )
, _id( id )
{
_no = nextNo++;
}
-QString
+TQString
KFeedbackAnswer::text()
{
- return QCheckListItem::text(0);
+ return TQCheckListItem::text(0);
}
-QString
+TQString
KFeedbackAnswer::key( int, bool ) const
{
- QString no;
+ TQString no;
no.sprintf( "%08d", _no );
return no;
diff --git a/kshowmail/kfeedback.h b/kshowmail/kfeedback.h
index 620ace7..10c0633 100644
--- a/kshowmail/kfeedback.h
+++ b/kshowmail/kfeedback.h
@@ -18,8 +18,8 @@
#include <config.h>
#endif
-#include <qlistview.h>
-#include <qvbox.h>
+#include <ntqlistview.h>
+#include <ntqvbox.h>
#include <kdialogbase.h>
@@ -32,7 +32,7 @@ class KFeedbackForm;
class KFeedbackQuestionList;
class KFeedbackQuestion;
class KFeedbackAnswer;
-class QMultiLineEdit;
+class TQMultiLineEdit;
/**
@@ -48,8 +48,8 @@ public:
/**
* Constructor.
**/
- KFeedbackDialog( const QString & feedbackMailAddress,
- const QString & helpTopic = QString::null );
+ KFeedbackDialog( const TQString & feedbackMailAddress,
+ const TQString & helpTopic = TQString::null );
/**
@@ -95,7 +95,7 @@ protected:
* User is asked a list of questions, the answers of which will be sent via
* mail back to a feedback mail address.
**/
-class KFeedbackForm: public QVBox
+class KFeedbackForm: public TQVBox
{
Q_OBJECT
@@ -103,8 +103,8 @@ public:
/**
* Constructor.
**/
- KFeedbackForm( const QString & feedbackMailAddress,
- QWidget * parent );
+ KFeedbackForm( const TQString & feedbackMailAddress,
+ TQWidget * parent );
/**
* Destructor.
@@ -171,20 +171,20 @@ protected:
/**
* Format the "personal comments" field for sending mail.
**/
- QString formatComment();
+ TQString formatComment();
- QString _feedbackMailAddress;
+ TQString _feedbackMailAddress;
KFeedbackQuestionList * _questionList;
- QMultiLineEdit * _comment;
+ TQMultiLineEdit * _comment;
};
/**
- * List of feedback questions presented in a @ref QListView widget.
+ * List of feedback questions presented in a @ref TQListView widget.
**/
-class KFeedbackQuestionList: public QListView
+class KFeedbackQuestionList: public TQListView
{
Q_OBJECT
@@ -193,7 +193,7 @@ public:
/**
* Constructor.
**/
- KFeedbackQuestionList( QWidget *parent );
+ KFeedbackQuestionList( TQWidget *parent );
/**
* Destructor.
@@ -209,7 +209,7 @@ public:
/**
* The result of all answered questions in ASCII.
**/
- QString result();
+ TQString result();
/**
* Add a yes/no question to the list.
@@ -228,16 +228,16 @@ public:
* Returns a pointer to this question so you can add answers.
**/
- KFeedbackQuestion * addQuestion( const QString & text,
- const QString & id,
+ KFeedbackQuestion * addQuestion( const TQString & text,
+ const TQString & id,
bool exclusiveAnswer = true,
bool required = false );
/**
* Add a yes/no question to the list.
**/
- void addYesNoQuestion( const QString & text,
- const QString & id,
+ void addYesNoQuestion( const TQString & text,
+ const TQString & id,
bool required = false );
/**
@@ -245,7 +245,7 @@ public:
* Use @ref KFeedbackQuestion::next() to get the next one.
**/
KFeedbackQuestion * firstQuestion() const
- { return (KFeedbackQuestion *) QListView::firstChild(); }
+ { return (KFeedbackQuestion *) TQListView::firstChild(); }
/**
* Notify the list that another question has been answered.
@@ -272,7 +272,7 @@ signals:
/**
* A user feedback question to be inserted into a @ref KFeedbackQuestionList.
**/
-class KFeedbackQuestion: public QCheckListItem
+class KFeedbackQuestion: public TQCheckListItem
{
public:
@@ -298,8 +298,8 @@ public:
* checked at any one time, to 'false' if multiple answers are allowed.
**/
KFeedbackQuestion( KFeedbackQuestionList * parent,
- const QString & text,
- const QString & id,
+ const TQString & text,
+ const TQString & id,
bool exclusiveAnswer = true,
bool required = false,
bool open = true );
@@ -310,8 +310,8 @@ public:
* the mail. The answer IDs need only be unique for that question; answers
* to other questions may have the same ID.
**/
- void addAnswer( const QString & text,
- const QString & id );
+ void addAnswer( const TQString & text,
+ const TQString & id );
/**
* Returns if answering this question is required.
@@ -331,17 +331,17 @@ public:
* features_i_like="pink_elephant"
* features_i_like="studlycapslyfier"
**/
- QString result();
+ TQString result();
/**
* Return this question's ID.
**/
- QString id() { return _id; }
+ TQString id() { return _id; }
/**
* Return this question's text.
**/
- QString text();
+ TQString text();
/**
* Returns whether or not this question requires an exclusive answer.
@@ -352,22 +352,22 @@ public:
/**
* Returns the sort key.
*
- * Reimplemented from @ref QListViewItem to maintain insertion order.
+ * Reimplemented from @ref TQListViewItem to maintain insertion order.
**/
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
/**
* Returns the next question or 0 if there is no more.
**/
KFeedbackQuestion * nextQuestion() const
- { return (KFeedbackQuestion *) QListViewItem::nextSibling(); }
+ { return (KFeedbackQuestion *) TQListViewItem::nextSibling(); }
/**
* Returns the first possible answer to this question.
* Use @ref KFeedbackAnswer::nextAnswer() to get the next one.
**/
KFeedbackAnswer * firstAnswer() const
- { return (KFeedbackAnswer *) QListViewItem::firstChild(); }
+ { return (KFeedbackAnswer *) TQListViewItem::firstChild(); }
/**
* Returns the @ref KFeedbackQuestionList this question belongs to or 0 if
@@ -378,14 +378,14 @@ public:
protected:
- QString _id;
+ TQString _id;
bool _exclusiveAnswer;
bool _required;
int _no;
};
-class KFeedbackAnswer: public QCheckListItem
+class KFeedbackAnswer: public TQCheckListItem
{
public:
/**
@@ -395,19 +395,19 @@ public:
* of many.
**/
KFeedbackAnswer( KFeedbackQuestion * parent,
- const QString & text,
- const QString & id,
+ const TQString & text,
+ const TQString & id,
bool exclusive = true );
/**
* Return this answer's ID.
**/
- QString id() { return _id; }
+ TQString id() { return _id; }
/**
* Return this answer's text.
**/
- QString text();
+ TQString text();
/**
* Returns whether or not this is an exclusive answer.
@@ -417,32 +417,32 @@ public:
/**
* Returns whether or not this answer is checked.
**/
- bool isChecked() { return QCheckListItem::isOn(); }
+ bool isChecked() { return TQCheckListItem::isOn(); }
/**
* Returns the next possible answer or 0 if there is no more.
**/
KFeedbackAnswer * nextAnswer() const
- { return (KFeedbackAnswer *) QListViewItem::nextSibling(); }
+ { return (KFeedbackAnswer *) TQListViewItem::nextSibling(); }
/**
* Returns the question to this answer.
**/
KFeedbackQuestion * question() const
- { return (KFeedbackQuestion *) QListViewItem::parent(); }
+ { return (KFeedbackQuestion *) TQListViewItem::parent(); }
/**
* Returns the sort key.
*
- * Reimplemented from @ref QListViewItem to maintain insertion order.
+ * Reimplemented from @ref TQListViewItem to maintain insertion order.
**/
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
/**
* On/off change.
*
- * Reimplemented from @ref QCheckListItem to monitor answering required
+ * Reimplemented from @ref TQCheckListItem to monitor answering required
* questions. This method notifies the @ref KFeedbackQuestionList whenever
* a required question is being answered.
**/
@@ -450,7 +450,7 @@ public:
protected:
- QString _id;
+ TQString _id;
bool _exclusive;
int _no;
};
diff --git a/kshowmail/kshowmail.cpp b/kshowmail/kshowmail.cpp
index 16e9db6..af64369 100644
--- a/kshowmail/kshowmail.cpp
+++ b/kshowmail/kshowmail.cpp
@@ -19,9 +19,9 @@
#include "kshowmail.h"
-using namespace KIO;
+using namespace TDEIO;
-KAboutData* KShowMailApp::m_pAbout;
+TDEAboutData* KShowMailApp::m_pAbout;
KShowMailApp::KShowMailApp()
{
@@ -46,7 +46,7 @@ KShowMailApp::KShowMailApp()
//the setup dialog will be created in slotSetup() at first use
SetupDialog = NULL;
- m_pTimer = new QTimer (this);
+ m_pTimer = new TQTimer (this);
m_pAlertDialog = NULL;
m_pDockWindow = new KShowMailDock (this, m_actionRefresh);
m_bForceClose = false;
@@ -62,7 +62,7 @@ KShowMailApp::KShowMailApp()
connect (m_pDockWindow, SIGNAL (quitSelected ()), SLOT (slotForceClose ()));
connect (m_pTimer, SIGNAL (timeout ()), SLOT (slotRefresh ()));
- connect (m_pView->m_pListAccounts, SIGNAL (currentChanged(QListViewItem*)), SLOT(slotAccountActivated(QListViewItem*)));
+ connect (m_pView->m_pListAccounts, SIGNAL (currentChanged(TQListViewItem*)), SLOT(slotAccountActivated(TQListViewItem*)));
connect (m_pView, SIGNAL (signalActiveChanged()), SLOT (slotRefreshView()));
connect( &m_ConfigList, SIGNAL( sigDeleteReady() ), this, SLOT( slotDeletionReady() ) );
@@ -75,7 +75,7 @@ KShowMailApp::KShowMailApp()
KMessageBox::information( NULL, i18n( "Thank You for using KShowmail.\nPlease use the feedback dialog to tell us your experience with this program." ), i18n("Welcome"), "WelcomeMessage" );
// this starts the one-second-interval timer
- // this is a QObject method
+ // this is a TQObject method
startTimer (1000);
//we are ready to take off! Lets initiate the first refresh (if desired)
@@ -91,15 +91,15 @@ KShowMailApp::~KShowMailApp()
}
/**
- * This is reimplemented from QObject
+ * This is reimplemented from TQObject
*/
-void KShowMailApp::timerEvent (QTimerEvent *)
+void KShowMailApp::timerEvent (TQTimerEvent *)
{
if (m_nSecondsToGo)
{
- QTime time;
+ TQTime time;
time = time.addSecs (m_nSecondsToGo--);
- QCString msg (i18n("Autorefresh: %1").arg (time.toString()));
+ TQCString msg (i18n("Autorefresh: %1").arg (time.toString()));
statusBar()->changeItem( msg, STATUSBAR_FIELD_NEXT_REFRESH );
}
else
@@ -116,7 +116,7 @@ void KShowMailApp::timerEvent (QTimerEvent *)
m_pDockWindow->clear ();
break;
default:
- m_pDockWindow->drawText ("?", Qt::red);
+ m_pDockWindow->drawText ("?", TQt::red);
}
}
}
@@ -129,14 +129,14 @@ void KShowMailApp::initActions ()
KStdAction::quit( this, SLOT( slotFileQuit() ), actionCollection() );
// action menu
- m_actionRefresh = new KAction( i18n( "&Refresh messages" ), "reload", Key_F5, this, SLOT( slotRefresh() ), actionCollection(), "refresh" );
- new KAction( i18n( "Show &header of highlighted messages" ), "letter-closed", Key_F2, this, SLOT( slotShowHeader() ), actionCollection(), "show_header" );
- new KAction( i18n( "Show &complete highlighted messages" ), "letter-open", Key_F3, this, SLOT( slotShowMessage() ), actionCollection(), "show_complete" );
- new KAction( i18n( "&Delete highlighted messages" ), "eraser", Key_Delete, this, SLOT( slotDelete() ), actionCollection(), "delete" );
- new KAction( i18n( "S&top current transfer" ), "stop", 0, this, SLOT( slotStop() ), actionCollection(), "stop" );
- new KAction( i18n( "Show Filter Log" ), "log", Key_F4, this, SLOT( slotShowFilterLog() ), actionCollection(), "show_filterlog" );
- new KAction( i18n( "Add sender to whitelist" ), "add_user", 0, this, SLOT( slotAddToWhitelist() ), actionCollection(), "addWhitelist" );
- new KAction( i18n( "Add sender to blacklist" ), "delete_user", 0, this, SLOT( slotAddToBlacklist() ), actionCollection(), "addBlacklist" );
+ m_actionRefresh = new TDEAction( i18n( "&Refresh messages" ), "reload", Key_F5, this, SLOT( slotRefresh() ), actionCollection(), "refresh" );
+ new TDEAction( i18n( "Show &header of highlighted messages" ), "letter-closed", Key_F2, this, SLOT( slotShowHeader() ), actionCollection(), "show_header" );
+ new TDEAction( i18n( "Show &complete highlighted messages" ), "letter-open", Key_F3, this, SLOT( slotShowMessage() ), actionCollection(), "show_complete" );
+ new TDEAction( i18n( "&Delete highlighted messages" ), "eraser", Key_Delete, this, SLOT( slotDelete() ), actionCollection(), "delete" );
+ new TDEAction( i18n( "S&top current transfer" ), "stop", 0, this, SLOT( slotStop() ), actionCollection(), "stop" );
+ new TDEAction( i18n( "Show Filter Log" ), "log", Key_F4, this, SLOT( slotShowFilterLog() ), actionCollection(), "show_filterlog" );
+ new TDEAction( i18n( "Add sender to whitelist" ), "add_user", 0, this, SLOT( slotAddToWhitelist() ), actionCollection(), "addWhitelist" );
+ new TDEAction( i18n( "Add sender to blacklist" ), "delete_user", 0, this, SLOT( slotAddToBlacklist() ), actionCollection(), "addBlacklist" );
// setup menu
KStdAction::preferences( this, SLOT( slotSetup() ), actionCollection() );
@@ -147,10 +147,10 @@ void KShowMailApp::initActions ()
createStandardStatusBarAction();
//help menu
- new KAction( i18n( "Send &Feedback Mail" ), "email", 0, this, SLOT( slotSendFeedbackMail() ),actionCollection(), "sendFeedback" );
+ new TDEAction( i18n( "Send &Feedback Mail" ), "email", 0, this, SLOT( slotSendFeedbackMail() ),actionCollection(), "sendFeedback" );
//for account context menu
- new KAction(i18n( "Setup &account" ), "tool", 0, this, SLOT( slotSetupAccount() ), actionCollection(), "setupAccount" );
+ new TDEAction(i18n( "Setup &account" ), "tool", 0, this, SLOT( slotSetupAccount() ), actionCollection(), "setupAccount" );
}
@@ -162,7 +162,7 @@ void KShowMailApp::initStatusBar()
statusBar()->insertItem( "", STATUSBAR_FIELD_NEXT_REFRESH );
statusBar()->insertItem( "", STATUSBAR_FIELD_LAST_REFRESH );
- QToolTip::add( statusBar(), i18n( "Shows the number of deleted, moved or ignored mails by the filter.\nThe positions denotes:\nby last refresh / since application start / listed by the log" ) );
+ TQToolTip::add( statusBar(), i18n( "Shows the number of deleted, moved or ignored mails by the filter.\nThe positions denotes:\nby last refresh / since application start / listed by the log" ) );
refreshFilterStatusBar();
}
@@ -176,7 +176,7 @@ void KShowMailApp::initDocument()
void KShowMailApp::initView()
{
////////////////////////////////////////////////////////////////////
- // create the main widget here that is managed by KMainWindow's view-region and
+ // create the main widget here that is managed by TDEMainWindow's view-region and
// connect the widget to your document to display document contents.
m_pView = new KshowmailView(this);
@@ -186,7 +186,7 @@ void KShowMailApp::initView()
void KShowMailApp::slotSaveOptions()
{
- KConfig* config = KGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
//order application parts to save their setup
m_pView->saveOptions( config );
@@ -211,7 +211,7 @@ bool KShowMailApp::queryClose()
// Don't close - close button must minimize the window
result = false;
kdDebug() << "ignoring close request and minimizing the window" << endl;
- KMainWindow* w = memberList->first();
+ TDEMainWindow* w = memberList->first();
w->hide();
} else {
// Need to ask user first
@@ -238,7 +238,7 @@ void KShowMailApp::slotFileQuit()
if(memberList && askCloseConfirmation())
{
m_bForceClose = true; // Forcing the closing
- KMainWindow* w = memberList->first();
+ TDEMainWindow* w = memberList->first();
w->close();
}
}
@@ -268,7 +268,7 @@ void KShowMailApp::slotSetupAccount()
//the dialog sets the new options directly in the account
ServerDialog dlg( this, pConfig );
- if( dlg.exec() == QDialog::Accepted )
+ if( dlg.exec() == TQDialog::Accepted )
{
//if OK was clicked, refresh the account list view
slotConfChanged();
@@ -280,9 +280,9 @@ void KShowMailApp::slotSetupAccount()
initNextRefresh();
}
-void KShowMailApp::slotAccountActivated (QListViewItem* pItem)
+void KShowMailApp::slotAccountActivated (TQListViewItem* pItem)
{
- QPtrListIterator<ConfigElem> it(m_ConfigList);
+ TQPtrListIterator<ConfigElem> it(m_ConfigList);
// this is = not == !!!
while (ConfigElem* pConfig = it())
{
@@ -326,7 +326,7 @@ void KShowMailApp::slotRefresh()
slotStatusMsg( i18n( "Refreshing ..." ) );
//set waiting cursor
- QApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
//order the account list to refresh its mail lists
m_ConfigList.refreshMailLists( &fLog );
@@ -356,8 +356,8 @@ void KShowMailApp::slotStop ()
//set normal cursor
//might be more than one override cursor ...
- while (QApplication::overrideCursor())
- QApplication::restoreOverrideCursor ();
+ while (TQApplication::overrideCursor())
+ TQApplication::restoreOverrideCursor ();
//print status message
slotStatusMsg(i18n("Job was stopped"));
@@ -382,10 +382,10 @@ void KShowMailApp::slotRefreshView ()
//draw number of mails into dock
if( hasNewMails )
//draw red number, because we have new mails
- m_pDockWindow->drawNumber( numberMails, Qt::red );
+ m_pDockWindow->drawNumber( numberMails, TQt::red );
else
//we haven't new mails, draw black
- m_pDockWindow->drawNumber( numberMails, Qt::black );
+ m_pDockWindow->drawNumber( numberMails, TQt::black );
//show message in status bar
long totalSize = m_ConfigList.getTotalSize();
@@ -412,7 +412,7 @@ void KShowMailApp::slotDelete()
if( m_ConfigList.confirmDeletion() )
{
//get subjects off all selected mails
- QStringList subjects = m_ConfigList.getSelectedSubjects();
+ TQStringList subjects = m_ConfigList.getSelectedSubjects();
//show question
int answer = KMessageBox::questionYesNoList( this, i18n( "Do you want to delete these mails?"), subjects, i18n( "Delete?" ) );
@@ -428,7 +428,7 @@ void KShowMailApp::slotDelete()
slotStatusMsg( i18n( "Deleting Mail(s) ..." ) );
//set waiting cursor
- QApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
//order the account list to delete the selected mails
//test!
@@ -469,17 +469,17 @@ void KShowMailApp::slotShowMessage ()
slotStatusMsg( i18n( "Downloading ..." ) );
//set waiting cursor
- QApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
//order the account list to show the selected mails
m_ConfigList.showSelectedMails();
}
-void KShowMailApp::slotStatusMsg(const QString& text)
+void KShowMailApp::slotStatusMsg(const TQString& text)
{
//get current time
// added by Gustavo Zamorano to include time
- QString sTime = QTime::currentTime ().toString ();
+ TQString sTime = TQTime::currentTime ().toString ();
//clear status bar
statusBar()->clear();
@@ -491,7 +491,7 @@ void KShowMailApp::slotStatusMsg(const QString& text)
statusBar()->changeItem( i18n( "Last Refresh: %1" ).arg( sTime ), STATUSBAR_FIELD_LAST_REFRESH );
}
-void KShowMailApp::slotStatusHelpMsg(const QString &text)
+void KShowMailApp::slotStatusHelpMsg(const TQString &text)
{
statusBar()->message(text, 2000);
}
@@ -499,14 +499,14 @@ void KShowMailApp::slotStatusHelpMsg(const QString &text)
-bool KShowMailApp::event(QEvent *e)
+bool KShowMailApp::event(TQEvent *e)
{
// to hide the taskbar button; any better solution ??
- if ((e->type() == QEvent::Hide) && m_ConfigList.minimizesToTray() ) {
+ if ((e->type() == TQEvent::Hide) && m_ConfigList.minimizesToTray() ) {
hide ();
}
- return(KMainWindow::event(e));
+ return(TDEMainWindow::event(e));
}
void KShowMailApp::slotForceClose()
@@ -536,8 +536,8 @@ void KShowMailApp::slotDeletionReady( )
m_state = idle;
//set normal cursor
- while( QApplication::overrideCursor() )
- QApplication::restoreOverrideCursor();
+ while( TQApplication::overrideCursor() )
+ TQApplication::restoreOverrideCursor();
//show status message
slotStatusMsg( i18n( "Ready." ) );
@@ -552,8 +552,8 @@ void KShowMailApp::slotShowMessageReady( )
m_state = idle;
//set normal cursor
- while( QApplication::overrideCursor() )
- QApplication::restoreOverrideCursor();
+ while( TQApplication::overrideCursor() )
+ TQApplication::restoreOverrideCursor();
//show status message
slotStatusMsg( i18n( "Ready." ) );
@@ -564,15 +564,15 @@ void KShowMailApp::slotShowMessageReady( )
void KShowMailApp::slotNormalCursor( )
{
//set normal cursor
- while( QApplication::overrideCursor() )
- QApplication::restoreOverrideCursor();
+ while( TQApplication::overrideCursor() )
+ TQApplication::restoreOverrideCursor();
}
void KShowMailApp::slotWaitingCursor( )
{
//set waiting cursor
- QApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
}
void KShowMailApp::slotRefreshReady( )
@@ -581,8 +581,8 @@ void KShowMailApp::slotRefreshReady( )
m_state = idle;
//set normal cursor
- while( QApplication::overrideCursor() )
- QApplication::restoreOverrideCursor();
+ while( TQApplication::overrideCursor() )
+ TQApplication::restoreOverrideCursor();
//refresh mail list view
slotRefreshView();
@@ -808,15 +808,15 @@ void KShowMailApp::refreshFilterStatusBar( )
void KShowMailApp::slotAddToWhitelist( )
{
//get new entries
- QStringList newEntries = m_ConfigList.getSelectedSenders();
+ TQStringList newEntries = m_ConfigList.getSelectedSenders();
//get previous whitelist from config
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
config->setGroup( CONFIG_GROUP_FILTER );
- QStringList whiteList = config->readListEntry( CONFIG_ENTRY_FILTER_WHITELIST );
+ TQStringList whiteList = config->readListEntry( CONFIG_ENTRY_FILTER_WHITELIST );
//append new entries
- for( QStringList::Iterator it = newEntries.begin(); it != newEntries.end(); ++it )
+ for( TQStringList::Iterator it = newEntries.begin(); it != newEntries.end(); ++it )
{
if( whiteList.contains( *it ) == 0 )
{
@@ -835,15 +835,15 @@ void KShowMailApp::slotAddToWhitelist( )
void KShowMailApp::slotAddToBlacklist( )
{
//get new entries
- QStringList newEntries = m_ConfigList.getSelectedSenders();
+ TQStringList newEntries = m_ConfigList.getSelectedSenders();
//get previous blacklist from config
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
config->setGroup( CONFIG_GROUP_FILTER );
- QStringList blackList = config->readListEntry( CONFIG_ENTRY_FILTER_BLACKLIST );
+ TQStringList blackList = config->readListEntry( CONFIG_ENTRY_FILTER_BLACKLIST );
//append new entries
- for( QStringList::Iterator it = newEntries.begin(); it != newEntries.end(); ++it )
+ for( TQStringList::Iterator it = newEntries.begin(); it != newEntries.end(); ++it )
{
if( blackList.contains( *it ) == 0 )
{
diff --git a/kshowmail/kshowmail.h b/kshowmail/kshowmail.h
index 0d8dccb..ed9ce7f 100644
--- a/kshowmail/kshowmail.h
+++ b/kshowmail/kshowmail.h
@@ -24,12 +24,12 @@
#endif
// include files for KDE
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
#include <kuniqueapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <krun.h>
#include <kpassdlg.h>
@@ -64,17 +64,17 @@ using namespace Types;
* window and reads the config file as well as providing a menubar, toolbar
* and statusbar. An instance of KshowmailView creates your center view, which is connected
* to the window's Doc object.
- * KShowMailApp reimplements the methods that KMainWindow provides for main window handling and supports
- * full session management as well as keyboard accelerator configuration by using KAccel.
- * @see KMainWindow
- * @see KApplication
- * @see KConfig
- * @see KAccel
+ * KShowMailApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+ * full session management as well as keyboard accelerator configuration by using TDEAccel.
+ * @see TDEMainWindow
+ * @see TDEApplication
+ * @see TDEConfig
+ * @see TDEAccel
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 0.4 code generation
*/
-class KShowMailApp : public KMainWindow
+class KShowMailApp : public TDEMainWindow
{
Q_OBJECT
@@ -103,7 +103,7 @@ class KShowMailApp : public KMainWindow
/**
* refresh messages action; connected with slotRefresh()
*/
- KAction* m_actionRefresh;
+ TDEAction* m_actionRefresh;
/**
* Contains the application and account settings. The account
@@ -124,7 +124,7 @@ class KShowMailApp : public KMainWindow
/**
* The refresh timer. Its timeout signal is connected with slotRefresh().
*/
- QTimer* m_pTimer;
+ TQTimer* m_pTimer;
/**
* Application state during the run time. Shows what KShowMail is doing :-) .
@@ -158,7 +158,7 @@ class KShowMailApp : public KMainWindow
* Contains information about KShowMail, including author, license, version etc.
* This is accessed in main() when calling KShowMailApp::initMenuBar() to create the help menu.
*/
- static KAboutData* m_pAbout;
+ static TDEAboutData* m_pAbout;
/**
* Delays the next refresh for one minute.
@@ -185,41 +185,41 @@ class KShowMailApp : public KMainWindow
void initDocument();
/**
- * creates the centerwidget of the KMainWindow instance and sets it as the view
+ * creates the centerwidget of the TDEMainWindow instance and sets it as the view
*/
void initView();
/**
- * queryClose is called by KMainWindow on each closeEvent of a window. Against the
+ * queryClose is called by TDEMainWindow on each closeEvent of a window. Against the
* default implementation (only returns true), this calles saveModified() on the document object to ask
* if the document should be saved if Modified; on cancel the closeEvent is rejected.
- * @see KMainWindow#queryClose
- * @see KMainWindow#closeEvent
+ * @see TDEMainWindow#queryClose
+ * @see TDEMainWindow#closeEvent
*/
virtual bool queryClose();
/**
- * queryExit is called by KMainWindow when the last window of the app is going to be closed during the closeEvent().
+ * queryExit is called by TDEMainWindow when the last window of the app is going to be closed during the closeEvent().
* Against the default implementation that just returns true, this calls saveOptions() to save the settings of
* the last window's properties.
- * @see KMainWindow#queryExit
- * @see KMainWindow#closeEvent
+ * @see TDEMainWindow#queryExit
+ * @see TDEMainWindow#closeEvent
*/
virtual bool queryExit();
/**
- * overwrite method of QObject; will be invoked by the internal QObject-Timer
+ * overwrite method of TQObject; will be invoked by the internal TQObject-Timer
* the timer is set to 1 second in the construtor;
* this method sets the time to the next refresh in the statusbar and
* animates the "?" in the traybar, when the refresh is working
*/
- virtual void timerEvent( QTimerEvent * );
+ virtual void timerEvent( TQTimerEvent * );
/**
- * overwrite method of QWidget;
+ * overwrite method of TQWidget;
* to hide the taskbar button
*/
- virtual bool event(QEvent *e);
+ virtual bool event(TQEvent *e);
/**
* Starts the first refresh or starts the refresh timer
@@ -251,7 +251,7 @@ class KShowMailApp : public KMainWindow
* icons and menu entries.
* @param text the text that is displayed in the statusbar
*/
- void slotStatusHelpMsg(const QString &text);
+ void slotStatusHelpMsg(const TQString &text);
/**
* Changes the contents in the left status bar item permanently,
@@ -259,7 +259,7 @@ class KShowMailApp : public KMainWindow
* in the right item.
* @param text the text that is displayed in the statusbar
*/
- void slotStatusMsg(const QString &text);
+ void slotStatusMsg(const TQString &text);
/**
* Connected with the setup dialog.
@@ -403,7 +403,7 @@ class KShowMailApp : public KMainWindow
*/
void slotAddToBlacklist();
- void slotAccountActivated(QListViewItem*);
+ void slotAccountActivated(TQListViewItem*);
void slotSendFeedbackMail();
void slotForceClose();
diff --git a/kshowmail/kshowmaildoc.cpp b/kshowmail/kshowmaildoc.cpp
index 05516ac..5dc412b 100644
--- a/kshowmail/kshowmaildoc.cpp
+++ b/kshowmail/kshowmaildoc.cpp
@@ -15,15 +15,15 @@
* *
***************************************************************************/
-// include files for Qt
-#include <qdir.h>
-#include <qwidget.h>
+// include files for TQt
+#include <ntqdir.h>
+#include <ntqwidget.h>
// include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
// application specific includes
#include "kshowmaildoc.h"
@@ -32,7 +32,7 @@
KshowmailView *KshowmailDoc::pView = 0L;
-KshowmailDoc::KshowmailDoc(QWidget *parent, const char *name) : QObject(parent, name)
+KshowmailDoc::KshowmailDoc(TQWidget *parent, const char *name) : TQObject(parent, name)
{
}
diff --git a/kshowmail/kshowmaildoc.h b/kshowmail/kshowmaildoc.h
index 7f9a541..e2bd9c5 100644
--- a/kshowmail/kshowmaildoc.h
+++ b/kshowmail/kshowmaildoc.h
@@ -23,8 +23,8 @@
#endif
// include files for QT
-#include <qobject.h>
-#include <qstring.h>
+#include <ntqobject.h>
+#include <ntqstring.h>
// include files for KDE
#include <kurl.h>
@@ -35,19 +35,19 @@ class KshowmailView;
/** KshowmailDoc provides a document object for a document-view model.
*
* The KshowmailDoc class provides a document object that can be used in conjunction with the classes KshowmailApp and KshowmailView
- * to create a document-view model for standard KDE applications based on KApplication and KMainWindow. Thereby, the document object
+ * to create a document-view model for standard KDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
* is created by the KshowmailApp instance and contains the document structure with the according methods for manipulation of the document
* data by KshowmailView objects. Also, KshowmailDoc contains the methods for serialization of the document data from and to files.
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 1.2 code generation
*/
-class KshowmailDoc : public QObject
+class KshowmailDoc : public TQObject
{
Q_OBJECT
public:
/** Constructor for the fileclass of the application */
- KshowmailDoc(QWidget *parent, const char *name=0);
+ KshowmailDoc(TQWidget *parent, const char *name=0);
/** Destructor for the fileclass of the application */
~KshowmailDoc();
diff --git a/kshowmail/kshowmaildock.cpp b/kshowmail/kshowmaildock.cpp
index c5eaa97..e278aaf 100644
--- a/kshowmail/kshowmaildock.cpp
+++ b/kshowmail/kshowmaildock.cpp
@@ -15,26 +15,26 @@
* *
***************************************************************************/
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qtooltip.h>
+#include <ntqpixmap.h>
+#include <ntqpainter.h>
+#include <ntqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kshowmail.h"
#include "kshowmaildock.h"
-KShowMailDock::KShowMailDock(QWidget* parent, KAction *actionRefresh )
+KShowMailDock::KShowMailDock(TQWidget* parent, TDEAction *actionRefresh )
: KSystemTray (parent, 0),
- m_background (QPixmap(::locate ("data", "kshowmail/pics/kshowmail24.png")))
+ m_background (TQPixmap(::locate ("data", "kshowmail/pics/kshowmail24.png")))
{
// kdDebug () << "KShowMailDock::KShowMailDock" << endl;
- drawText ("?", Qt::red);
- QToolTip::add (this, i18n("KShowmail: a powerful pop3 email checker"));
+ drawText ("?", TQt::red);
+ TQToolTip::add (this, i18n("KShowmail: a powerful pop3 email checker"));
show();
@@ -44,33 +44,33 @@ KShowMailDock::KShowMailDock(QWidget* parent, KAction *actionRefresh )
connect (contextMenu(),SIGNAL(highlighted(int)),this, SIGNAL(sigHighlighted(int)));
}
-void KShowMailDock::drawText (const QString str, const QColor& color)
+void KShowMailDock::drawText (const TQString str, const TQColor& color)
{
setPixmap (m_background);
- QPixmap* pix = pixmap ();
+ TQPixmap* pix = pixmap ();
if (pix && !pix->isNull ())
{
- QPainter p (pix);
-// p.setFont (KGlobalSettings::toolBarFont());
- p.setFont (KGlobalSettings::windowTitleFont());
+ TQPainter p (pix);
+// p.setFont (TDEGlobalSettings::toolBarFont());
+ p.setFont (TDEGlobalSettings::windowTitleFont());
p.setPen (color);
- p.drawText (0,0,24,24,QPainter::AlignCenter,str,str.length());
+ p.drawText (0,0,24,24,TQPainter::AlignCenter,str,str.length());
}
else
kdError () << "No pixmap for traybar !" << endl;
}
-void KShowMailDock::drawNumber (int n, const QColor& color)
+void KShowMailDock::drawNumber (int n, const TQColor& color)
{
setPixmap (m_background);
- QPixmap* pix = pixmap ();
+ TQPixmap* pix = pixmap ();
if (pix && !pix->isNull ())
{
- QString num (QString::number(n));
- QPainter p (pix);
- p.setFont (KGlobalSettings::toolBarFont());
+ TQString num (TQString::number(n));
+ TQPainter p (pix);
+ p.setFont (TDEGlobalSettings::toolBarFont());
p.setPen (color);
- p.drawText (0,0,24,24,QPainter::AlignCenter,num,num.length());
+ p.drawText (0,0,24,24,TQPainter::AlignCenter,num,num.length());
}
else
kdError () << "No pixmap for traybar !" << endl;
diff --git a/kshowmail/kshowmaildock.h b/kshowmail/kshowmaildock.h
index bc84f5b..79722d3 100644
--- a/kshowmail/kshowmaildock.h
+++ b/kshowmail/kshowmaildock.h
@@ -18,10 +18,10 @@
#ifndef KSHOWMAILDOCK_H
#define KSHOWMAILDOCK_H
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <ntqwidget.h>
+#include <ntqpixmap.h>
#include <ksystemtray.h>
-#include <kaction.h>
+#include <tdeaction.h>
/**
*@author Eggert Ehmke
@@ -31,16 +31,16 @@ class KShowMailDock : public KSystemTray
{
Q_OBJECT
public:
- KShowMailDock(QWidget*, KAction *actionRefresh );
+ KShowMailDock(TQWidget*, TDEAction *actionRefresh );
~KShowMailDock() {};
- void drawText (const QString str, const QColor& color);
- void drawNumber (int n, const QColor& color);
+ void drawText (const TQString str, const TQColor& color);
+ void drawNumber (int n, const TQColor& color);
void clear ();
signals:
void sigActivated(int);
void sigHighlighted(int);
private:
- QPixmap m_background;
+ TQPixmap m_background;
};
#endif
diff --git a/kshowmail/kshowmailfeedback.cpp b/kshowmail/kshowmailfeedback.cpp
index b1fe297..073e529 100644
--- a/kshowmail/kshowmailfeedback.cpp
+++ b/kshowmail/kshowmailfeedback.cpp
@@ -13,7 +13,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kshowmail.h"
#include "kfeedback.h"
diff --git a/kshowmail/kshowmailview.cpp b/kshowmail/kshowmailview.cpp
index d7fb3a5..860bd79 100644
--- a/kshowmail/kshowmailview.cpp
+++ b/kshowmail/kshowmailview.cpp
@@ -17,15 +17,15 @@
* *
***************************************************************************/
-// include files for Qt
-#include <qprinter.h>
-#include <qpainter.h>
-#include <qmessagebox.h>
-#include <qkeycode.h>
-#include <qvaluelist.h>
+// include files for TQt
+#include <ntqprinter.h>
+#include <ntqpainter.h>
+#include <ntqmessagebox.h>
+#include <ntqkeycode.h>
+#include <ntqvaluelist.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// application specific includes
@@ -33,21 +33,21 @@
#include "kshowmaildoc.h"
#include "kshowmail.h"
-KshowmailView::KshowmailView(QWidget *parent, const char *name):
- QSplitter(Vertical, parent, name)
+KshowmailView::KshowmailView(TQWidget *parent, const char *name):
+ TQSplitter(Vertical, parent, name)
{
setBackgroundMode( PaletteBase );
- setFocusPolicy( QWidget::StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
//get application config object (kshowmailrc)
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load active pic for the account list
- m_pixOk = new QPixmap( ::locate( "data", "kshowmail/pics/ok.png" ) );
+ m_pixOk = new TQPixmap( ::locate( "data", "kshowmail/pics/ok.png" ) );
//create account list
- m_pListAccounts = new KListView( this, "accounts" );
- m_pListAccounts->setSelectionMode( QListView::Extended );
+ m_pListAccounts = new TDEListView( this, "accounts" );
+ m_pListAccounts->setSelectionMode( TQListView::Extended );
m_pListAccounts->setSorting( 1 ); // sort account column
m_pListAccounts->setShowSortIndicator( true );
m_pListAccounts->addColumn( i18n( "Active" ), DEFAULT_WIDTH_ACCOUNT_ACTIVE );
@@ -57,12 +57,12 @@ KshowmailView::KshowmailView(QWidget *parent, const char *name):
m_pListAccounts->addColumn( i18n( "Messages" ), DEFAULT_WIDTH_ACCOUNT_MESSAGES );
m_pListAccounts->addColumn( i18n( "Size" ), DEFAULT_WIDTH_ACCOUNT_SIZE );
m_pListAccounts->setAllColumnsShowFocus( true );
- connect( m_pListAccounts, SIGNAL( rightButtonClicked( QListViewItem*, const QPoint &, int ) ), SLOT( slotAccountContext( QListViewItem*, const QPoint &, int ) ) );
- connect( m_pListAccounts, SIGNAL( clicked( QListViewItem*, const QPoint &, int) ), SLOT( slotAccountClicked( QListViewItem*, const QPoint &, int ) ) );
+ connect( m_pListAccounts, SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( slotAccountContext( TQListViewItem*, const TQPoint &, int ) ) );
+ connect( m_pListAccounts, SIGNAL( clicked( TQListViewItem*, const TQPoint &, int) ), SLOT( slotAccountClicked( TQListViewItem*, const TQPoint &, int ) ) );
//create message list
- m_pListMessages = new KListView( this, "messages" );
- m_pListMessages->setSelectionMode( QListView::Extended );
+ m_pListMessages = new TDEListView( this, "messages" );
+ m_pListMessages->setSelectionMode( TQListView::Extended );
m_pListMessages->setAllColumnsShowFocus( true );
m_pListMessages->setSorting( ShowListViewItem::_colNumber ); // sort number column
m_pListMessages->setShowSortIndicator( true );
@@ -75,9 +75,9 @@ KshowmailView::KshowmailView(QWidget *parent, const char *name):
m_pListMessages->addColumn( i18n( "Size" ), DEFAULT_WIDTH_MESSAGE_SIZE );
m_pListMessages->addColumn( i18n( "Content" ), DEFAULT_WIDTH_MESSAGE_CONTENT );
m_pListMessages->addColumn( i18n( "State" ), DEFAULT_WIDTH_MESSAGE_STATE );
- connect( m_pListMessages, SIGNAL( rightButtonClicked( QListViewItem*, const QPoint &, int) ), SLOT( slotMessageContext( QListViewItem*, const QPoint &, int ) ) );
- connect( m_pListMessages, SIGNAL( doubleClicked( QListViewItem* ) ), SLOT( slotMessageDoubleClicked( QListViewItem* ) ) );
- connect( m_pListMessages, SIGNAL( clicked( QListViewItem* ) ), SLOT( slotMessageClicked( QListViewItem* ) ) );
+ connect( m_pListMessages, SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int) ), SLOT( slotMessageContext( TQListViewItem*, const TQPoint &, int ) ) );
+ connect( m_pListMessages, SIGNAL( doubleClicked( TQListViewItem* ) ), SLOT( slotMessageDoubleClicked( TQListViewItem* ) ) );
+ connect( m_pListMessages, SIGNAL( clicked( TQListViewItem* ) ), SLOT( slotMessageClicked( TQListViewItem* ) ) );
//read the geometry from the application config file
readOptions();
@@ -95,7 +95,7 @@ void KshowmailView::readOptions()
{
//read splitter geometry
config->setGroup ("Display Options");
- QValueList<int> size;
+ TQValueList<int> size;
size.append (config->readNumEntry ("sizeaccounts", 40));
size.append (config->readNumEntry ("sizemessages", 50));
setSizes (size);
@@ -105,12 +105,12 @@ void KshowmailView::readOptions()
m_pListMessages->restoreLayout( config, CONFIG_GROUP_MESSAGE_LIST );
}
-void KshowmailView::saveOptions (KConfig* config)
+void KshowmailView::saveOptions (TDEConfig* config)
{
// kdDebug () << "KshowmailView::saveOptions" << endl;
config->setGroup("Display Options");
//splitter
- QValueList<int> size = sizes ();
+ TQValueList<int> size = sizes ();
config->writeEntry ("sizeaccounts", size [0]);
config->writeEntry ("sizemessages", size [1]);
// layout
@@ -119,7 +119,7 @@ void KshowmailView::saveOptions (KConfig* config)
}
-void KshowmailView::slotMessageContext( QListViewItem* pItem, const QPoint&, int )
+void KshowmailView::slotMessageContext( TQListViewItem* pItem, const TQPoint&, int )
{
if( pItem != NULL )
{
@@ -127,16 +127,16 @@ void KshowmailView::slotMessageContext( QListViewItem* pItem, const QPoint&, int
KShowMailApp* theApp = ( KShowMailApp * )parentWidget();
//create and show popup menu
- QWidget* w = theApp->factory()->container( "mail_context_popup", theApp );
- QPopupMenu* popup = static_cast<QPopupMenu*>( w );
- popup->exec( QCursor::pos() );
+ TQWidget* w = theApp->factory()->container( "mail_context_popup", theApp );
+ TQPopupMenu* popup = static_cast<TQPopupMenu*>( w );
+ popup->exec( TQCursor::pos() );
//select clicked item
m_pListMessages->setSelected (pItem, true);
}
}
-void KshowmailView::slotAccountContext( QListViewItem* pItem, const QPoint&, int )
+void KshowmailView::slotAccountContext( TQListViewItem* pItem, const TQPoint&, int )
{
if ( pItem != NULL )
{
@@ -144,20 +144,20 @@ void KshowmailView::slotAccountContext( QListViewItem* pItem, const QPoint&, int
KShowMailApp* theApp = ( KShowMailApp * )parentWidget();
//create and show popup menu
- QWidget* w = theApp->factory()->container( "account_context_popup", theApp );
- QPopupMenu* popup = static_cast<QPopupMenu*>( w );
- popup->exec( QCursor::pos() );
+ TQWidget* w = theApp->factory()->container( "account_context_popup", theApp );
+ TQPopupMenu* popup = static_cast<TQPopupMenu*>( w );
+ popup->exec( TQCursor::pos() );
//select clicked item
m_pListAccounts->setSelected( pItem, true );
}
}
-void KshowmailView::slotAccountClicked( QListViewItem* pItem, const QPoint&, int col )
+void KshowmailView::slotAccountClicked( TQListViewItem* pItem, const TQPoint&, int col )
{
//get application config object (kshowmailrc)
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
if( col == 0 )
{
@@ -167,7 +167,7 @@ void KshowmailView::slotAccountClicked( QListViewItem* pItem, const QPoint&, int
if( pElem != NULL )
{
//get account name
- QString name = pElem->getAccountName();
+ TQString name = pElem->getAccountName();
//set config group
config->setGroup( name );
@@ -199,7 +199,7 @@ void KshowmailView::slotAccountClicked( QListViewItem* pItem, const QPoint&, int
}
}
-void KshowmailView::slotMessageDoubleClicked (QListViewItem* pItem)
+void KshowmailView::slotMessageDoubleClicked (TQListViewItem* pItem)
{
if (pItem)
{
@@ -210,7 +210,7 @@ void KshowmailView::slotMessageDoubleClicked (QListViewItem* pItem)
}
}
-void KshowmailView::slotMessageClicked (QListViewItem* pItem)
+void KshowmailView::slotMessageClicked (TQListViewItem* pItem)
{
if (pItem)
{
@@ -226,7 +226,7 @@ void KshowmailView::clearMailListView( )
m_pListMessages->clear();
}
-ShowListViewItem* KshowmailView::insertMail( QString& number, QString& account, QString& from, QString& to, QString& subject, QString& date, QString& size, QString& content, QString& state, QString& time )
+ShowListViewItem* KshowmailView::insertMail( TQString& number, TQString& account, TQString& from, TQString& to, TQString& subject, TQString& date, TQString& size, TQString& content, TQString& state, TQString& time )
{
//create item
ShowListViewItem* item = new ShowListViewItem( m_pListMessages );
@@ -248,8 +248,8 @@ ShowListViewItem* KshowmailView::insertMail( QString& number, QString& account,
void KshowmailView::refreshSetup( )
{
- QString ConfigEntryDisplay; //entry of the config about show or hide column
- QString ConfigEntrySavedWidth; //entry of the config about saved width
+ TQString ConfigEntryDisplay; //entry of the config about show or hide column
+ TQString ConfigEntrySavedWidth; //entry of the config about saved width
int DefaultWidth = 100; //default width of the proceeded column
bool DefaultDisplay = true; //default show or hide of the proceeded column
diff --git a/kshowmail/kshowmailview.h b/kshowmail/kshowmailview.h
index e417e2e..8e3607c 100644
--- a/kshowmail/kshowmailview.h
+++ b/kshowmail/kshowmailview.h
@@ -24,16 +24,16 @@
#include <config.h>
#endif
-//Qt headers
-#include <qwidget.h>
-#include <qsplitter.h>
-#include <qcursor.h>
-#include <qpopupmenu.h>
+//TQt headers
+#include <ntqwidget.h>
+#include <ntqsplitter.h>
+#include <ntqcursor.h>
+#include <ntqpopupmenu.h>
//KDE headers
-#include <klistview.h>
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdelistview.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
//KShowmail headers
#include "configlist.h"
@@ -45,7 +45,7 @@ class ConfigList;
class KshowmailDoc;
/** The KshowmailView class provides the view widget for the KShowMailApp instance.
- * The View instance inherits QWidget as a base class and represents the view object of a KMainWindow.
+ * The View instance inherits TQWidget as a base class and represents the view object of a TDEMainWindow.
* As KshowmailView is part of the document-view model, it needs a reference to the document object
* connected with it by the KShowMailApp class to manipulate and display
* the document structure provided by the KshowmailDoc class.
@@ -54,7 +54,7 @@ class KshowmailDoc;
* @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
* @version KDevelop version 0.4 code generation
*/
-class KshowmailView : public QSplitter
+class KshowmailView : public TQSplitter
{
Q_OBJECT
@@ -63,7 +63,7 @@ class KshowmailView : public QSplitter
/**
* Constructor for the main view
*/
- KshowmailView(QWidget *parent = 0, const char *name=0);
+ KshowmailView(TQWidget *parent = 0, const char *name=0);
/**
@@ -74,7 +74,7 @@ class KshowmailView : public QSplitter
/**
* Saves the options
*/
- void saveOptions( KConfig* config );
+ void saveOptions( TDEConfig* config );
/**
* Clears the mail list view.
@@ -96,7 +96,7 @@ class KshowmailView : public QSplitter
* @param time send date, formated to the ISO 8601 extended specification (YYYY-MM-DDTHH:MM:SS)
* @return pointer to the created list view item
*/
- ShowListViewItem* insertMail( QString& number, QString& account, QString& from, QString& to, QString& subject, QString& date, QString& size, QString& content, QString& state, QString& time );
+ ShowListViewItem* insertMail( TQString& number, TQString& account, TQString& from, TQString& to, TQString& subject, TQString& date, TQString& size, TQString& content, TQString& state, TQString& time );
/**
* Refreshes the geometry.
@@ -106,17 +106,17 @@ class KshowmailView : public QSplitter
*/
void refreshSetup();
- KListView* m_pListAccounts;
- KListView* m_pListMessages;
+ TDEListView* m_pListAccounts;
+ TDEListView* m_pListMessages;
private:
- QPixmap* m_pixOk;
+ TQPixmap* m_pixOk;
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* Reads the some geometry options from the application config file.
@@ -131,10 +131,10 @@ private slots:
* Selects the clicked item and shows the popup menu mail_context_popup defined in
* kshowmailui.rc.
*/
- void slotMessageContext( QListViewItem*, const QPoint&, int );
+ void slotMessageContext( TQListViewItem*, const TQPoint&, int );
- void slotMessageDoubleClicked (QListViewItem*);
- void slotMessageClicked (QListViewItem*);
+ void slotMessageDoubleClicked (TQListViewItem*);
+ void slotMessageClicked (TQListViewItem*);
/**
* Connected with signal rightButtonClicked of m_pListAccounts.
@@ -142,13 +142,13 @@ private slots:
* Selects the clicked item and shows the popup menu account_context_popup defined in
* kshowmailui.rc.
*/
- void slotAccountContext( QListViewItem*, const QPoint &, int );
+ void slotAccountContext( TQListViewItem*, const TQPoint &, int );
/**
* Connected with signal clicked of the account list.
* Activate or deactivate the account, if the user has clicked in the first column
*/
- void slotAccountClicked( QListViewItem*, const QPoint& point, int col );
+ void slotAccountClicked( TQListViewItem*, const TQPoint& point, int col );
signals:
void signalActiveChanged ();
diff --git a/kshowmail/main.cpp b/kshowmail/main.cpp
index a28067a..8e5d96a 100644
--- a/kshowmail/main.cpp
+++ b/kshowmail/main.cpp
@@ -16,10 +16,10 @@
***************************************************************************/
//KDE-Header
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
//KShowmail-Header
@@ -34,24 +34,24 @@ static const char *description = I18N_NOOP("A powerful pop3 mail checker");
//the command line options
//see constants.h
-static KCmdLineOptions kshowmailOptions[] =
+static TDECmdLineOptions kshowmailOptions[] =
{
{ CMDLINE_REFRESH_SHORT, 0, 0},
{ CMDLINE_REFRESH, I18N_NOOP("Refresh messages now"), 0 },
{ CMDLINE_CONFIG_SHORT, 0, 0},
{ CMDLINE_CONFIG, I18N_NOOP("Launch configure dialog"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char *argv[])
{
//create datas for the about box
- KShowMailApp::m_pAbout = new KAboutData (
+ KShowMailApp::m_pAbout = new TDEAboutData (
/*appName */ "kshowmail",
/*programName*/ "KShowmail",
/*version */ VERSION,
/*description*/ description,
- /*license */ KAboutData::License_GPL_V2,
+ /*license */ TDEAboutData::License_GPL_V2,
/*copyright */ "(C) 2000-2005, Eggert Ehmke",
/*text */ 0,
/*homepage */ "http://sourceforge.net/projects/kshowmail",
@@ -65,17 +65,17 @@ int main(int argc, char *argv[])
KShowMailApp::m_pAbout->setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names") ,I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"));
//Initialize command line arguments
- KCmdLineArgs::init(argc, argv, KShowMailApp::m_pAbout);
+ TDECmdLineArgs::init(argc, argv, KShowMailApp::m_pAbout);
//add the special command line options of kshowmail which was specified above
- KCmdLineArgs::addCmdLineOptions(kshowmailOptions);
+ TDECmdLineArgs::addCmdLineOptions(kshowmailOptions);
// when released, this must be 0!
#if 0
kdDebug () << "KShowmail running in debug mode" << endl;
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
- KApplication app;
+ TDEApplication app;
KShowMailApp* kshow = new KShowMailApp ();
kshow->show();
app.exec();
diff --git a/kshowmail/senderlistfilter.cpp b/kshowmail/senderlistfilter.cpp
index fcb4e6d..881a376 100644
--- a/kshowmail/senderlistfilter.cpp
+++ b/kshowmail/senderlistfilter.cpp
@@ -15,7 +15,7 @@ SenderListFilter::SenderListFilter()
{
//get the application config object
- config = KApplication::kApplication()->config();
+ config = TDEApplication::kApplication()->config();
//load the setup
load();
@@ -27,7 +27,7 @@ SenderListFilter::~SenderListFilter()
{
}
-FilterAction_Type SenderListFilter::check( QString sender ) const
+FilterAction_Type SenderListFilter::check( TQString sender ) const
{
//return with none action if the given string is empty
if( sender.isEmpty() ) return FActNone;
@@ -60,14 +60,14 @@ void SenderListFilter::load( )
}
}
-bool SenderListFilter::search( QStringList list, QString sender ) const
+bool SenderListFilter::search( TQStringList list, TQString sender ) const
{
//return with FALSE if the list or the search string are empty
if( list.isEmpty() || sender.isEmpty() ) return false;
//iterate over the list to search for the sender
bool found = false;
- for( QStringList::Iterator it = list.begin(); it != list.end() && found == false; ++it )
+ for( TQStringList::Iterator it = list.begin(); it != list.end() && found == false; ++it )
{
if( sender.contains( *it, false ) || (*it).contains( sender, false ) )
found = true;
@@ -79,7 +79,7 @@ bool SenderListFilter::search( QStringList list, QString sender ) const
void SenderListFilter::print( )
{
kdDebug() << "Blacklist:" << endl;
- for( QStringList::Iterator it = blacklist.begin(); it != blacklist.end(); ++it )
+ for( TQStringList::Iterator it = blacklist.begin(); it != blacklist.end(); ++it )
{
kdDebug() << *it << endl;
}
@@ -94,7 +94,7 @@ void SenderListFilter::print( )
kdDebug() << endl;
kdDebug() << "Whitelist:" << endl;
- for( QStringList::Iterator it = whitelist.begin(); it != whitelist.end(); ++it )
+ for( TQStringList::Iterator it = whitelist.begin(); it != whitelist.end(); ++it )
{
kdDebug() << *it << endl;
}
diff --git a/kshowmail/senderlistfilter.h b/kshowmail/senderlistfilter.h
index d54237f..ec3fa72 100644
--- a/kshowmail/senderlistfilter.h
+++ b/kshowmail/senderlistfilter.h
@@ -12,13 +12,13 @@
#ifndef SENDERLISTFILTER_H
#define SENDERLISTFILTER_H
-//Qt headers
-#include <qstring.h>
-#include <qstringlist.h>
+//TQt headers
+#include <ntqstring.h>
+#include <ntqstringlist.h>
//KDE headers
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
#include <kdebug.h>
//Kshowmail headers
@@ -53,7 +53,7 @@ class SenderListFilter{
* @param sender sender which shall be checked
* @return appointed action (FActPass, FActDelete, FActMark, FActNone)
*/
- FilterAction_Type check( QString sender ) const;
+ FilterAction_Type check( TQString sender ) const;
/**
* Loads the setup from the application config file.
@@ -70,17 +70,17 @@ class SenderListFilter{
/**
* Connector to the configuration file
*/
- KConfig* config;
+ TDEConfig* config;
/**
* blacklisted addresses
*/
- QStringList blacklist;
+ TQStringList blacklist;
/**
* whitelisted addresses
*/
- QStringList whitelist;
+ TQStringList whitelist;
/**
* appointed action of the blacklist.
@@ -107,7 +107,7 @@ class SenderListFilter{
* @param sender searched sender name
* @return TRUE - the given sender name is listed. FALSE - is not listed
*/
- bool search( QStringList list, QString sender ) const;
+ bool search( TQStringList list, TQString sender ) const;
};
#endif
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index b61aa25..9d7ad94 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -17,8 +17,8 @@
#include "serverdialog.h"
-ServerDialog::ServerDialog( QWidget* parent, ConfigElem* item )
- : KDialogBase( parent, "ServerDialog", true, QString::null, Ok|Cancel, Ok, true )
+ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
+ : KDialogBase( parent, "ServerDialog", true, TQString::null, Ok|Cancel, Ok, true )
{
//save pointer to account and view
account = item;
@@ -28,79 +28,79 @@ ServerDialog::ServerDialog( QWidget* parent, ConfigElem* item )
tabs->setMargin( 10 );
//pages
- QWidget* pgGeneral = new QWidget( this );
- QWidget* pgSecurity = new QWidget( this );
+ TQWidget* pgGeneral = new TQWidget( this );
+ TQWidget* pgSecurity = new TQWidget( this );
setMainWidget( tabs );
//layouts of general page
- QVBoxLayout* layGeneral = new QVBoxLayout( pgGeneral, 0, spacingHint() );
- QGridLayout* layTop = new QGridLayout( layGeneral, 5, 2 );
+ TQVBoxLayout* layGeneral = new TQVBoxLayout( pgGeneral, 0, spacingHint() );
+ TQGridLayout* layTop = new TQGridLayout( layGeneral, 5, 2 );
//layouts of security page
- QVBoxLayout* laySecurity = new QVBoxLayout( pgSecurity, 0, spacingHint() );
- laySecurity->setAlignment( Qt::AlignTop );
+ TQVBoxLayout* laySecurity = new TQVBoxLayout( pgSecurity, 0, spacingHint() );
+ laySecurity->setAlignment( TQt::AlignTop );
//upper items
- QLabel* lblAccount = new QLabel( i18n( "Account:" ), pgGeneral, "lblAccount" );
+ TQLabel* lblAccount = new TQLabel( i18n( "Account:" ), pgGeneral, "lblAccount" );
txtAccount = new KLineEdit( pgGeneral, "txtAccount" );
txtAccount->setEnabled( false );
- QToolTip::add( lblAccount, i18n( "Unique Account Name" ) );
- QToolTip::add( txtAccount, i18n( "Unique Account Name" ) );
+ TQToolTip::add( lblAccount, i18n( "Unique Account Name" ) );
+ TQToolTip::add( txtAccount, i18n( "Unique Account Name" ) );
layTop->addWidget( lblAccount, 0, 0 );
layTop->addWidget( txtAccount, 0, 1 );
- QLabel* lblServer = new QLabel( i18n( "Server:" ), pgGeneral, "lblServer" );
+ TQLabel* lblServer = new TQLabel( i18n( "Server:" ), pgGeneral, "lblServer" );
txtServer = new KLineEdit( pgGeneral, "txtServer" );
txtServer->setFocus();
- QToolTip::add( lblServer, i18n( "Server Name" ) );
- QToolTip::add( txtAccount, i18n( "Server Name" ) );
+ TQToolTip::add( lblServer, i18n( "Server Name" ) );
+ TQToolTip::add( txtAccount, i18n( "Server Name" ) );
layTop->addWidget( lblServer, 1, 0 );
layTop->addWidget( txtServer, 1, 1 );
- QLabel* lblProtocol = new QLabel( i18n( "Protocol:" ), pgGeneral, "lblProtocol" );
+ TQLabel* lblProtocol = new TQLabel( i18n( "Protocol:" ), pgGeneral, "lblProtocol" );
cboProtocol = new KComboBox( pgGeneral, "cboProtocol" );
cboProtocol->insertItem( "POP3" ); //currently KShowmail just supports POP3
- QToolTip::add( lblProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
- QToolTip::add( cboProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
+ TQToolTip::add( lblProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
+ TQToolTip::add( cboProtocol, i18n( "Protocol, which shall be used to get the mails from the server. Currently KShowmail just supports POP3.") );
layTop->addWidget( lblProtocol, 2, 0 );
layTop->addWidget( cboProtocol, 2, 1 );
- QLabel* lblPort = new QLabel( i18n( "Port:" ), pgGeneral, "lblPort" );
- spbPort = new QSpinBox( 0, 65535, 1, pgGeneral, "spbPort" );
+ TQLabel* lblPort = new TQLabel( i18n( "Port:" ), pgGeneral, "lblPort" );
+ spbPort = new TQSpinBox( 0, 65535, 1, pgGeneral, "spbPort" );
spbPort->setValue( DEFAULT_ACCOUNT_PORT_POP3 );
- QToolTip::add( lblPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
- QToolTip::add( spbPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
+ TQToolTip::add( lblPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
+ TQToolTip::add( spbPort, i18n( "Port Number. Normally POP3 uses port 110." ) );
layTop->addWidget( lblPort, 3, 0 );
layTop->addWidget( spbPort, 3, 1 );
- QLabel* lblUser = new QLabel( i18n( "User:" ), pgGeneral, "lblUser" );
+ TQLabel* lblUser = new TQLabel( i18n( "User:" ), pgGeneral, "lblUser" );
txtUser = new KLineEdit( pgGeneral, "txtUser" );
- QToolTip::add( lblUser, i18n( "To authenticate to the mail server you need an user name." ) );
- QToolTip::add( txtUser, i18n( "To authenticate to the mail server you need an user name." ) );
+ TQToolTip::add( lblUser, i18n( "To authenticate to the mail server you need an user name." ) );
+ TQToolTip::add( txtUser, i18n( "To authenticate to the mail server you need an user name." ) );
layTop->addWidget( lblUser, 4, 0 );
layTop->addWidget( txtUser, 4, 1 );
//password groupbox and layouts
- QGroupBox* gboxPassword = new QGroupBox( 0, Qt::Horizontal, i18n( "Password" ), pgGeneral, "gboxPassword" );
+ TQGroupBox* gboxPassword = new TQGroupBox( 0, TQt::Horizontal, i18n( "Password" ), pgGeneral, "gboxPassword" );
layGeneral->addWidget( gboxPassword );
- QVBoxLayout* layPassword = new QVBoxLayout( gboxPassword->layout(), spacingHint() );
- QGridLayout* layPasswordStorage = new QGridLayout( layPassword, 2, 2, spacingHint() );
+ TQVBoxLayout* layPassword = new TQVBoxLayout( gboxPassword->layout(), spacingHint() );
+ TQGridLayout* layPasswordStorage = new TQGridLayout( layPassword, 2, 2, spacingHint() );
//radio buttons to set storage of the password
- grpPasswordStorage = new QButtonGroup( NULL, "grpPasswordStorage" );
+ grpPasswordStorage = new TQButtonGroup( NULL, "grpPasswordStorage" );
connect( grpPasswordStorage, SIGNAL( clicked( int ) ), this, SLOT( slotPasswordStorageChanged( int ) ) );
- QRadioButton* btnPasswordDontSave = new QRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
- QRadioButton* btnPasswordSaveFile = new QRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
- QRadioButton* btnPasswordSaveKWallet = new QRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
+ TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
+ TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
+ TQRadioButton* btnPasswordSaveKWallet = new TQRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
grpPasswordStorage->insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
- QToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
- QToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
- QToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
+ TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
+ TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
+ TQToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
layPasswordStorage->addWidget( btnPasswordDontSave, 0, 0 );
layPasswordStorage->addWidget( btnPasswordSaveFile, 0, 1 );
layPasswordStorage->addWidget( btnPasswordSaveKWallet, 1, 0 );
@@ -114,33 +114,33 @@ ServerDialog::ServerDialog( QWidget* parent, ConfigElem* item )
slotPasswordStorageChanged( DEFAULT_ACCOUNT_PASSWORD_STORAGE );
//active check box
- QGridLayout* layActive = new QGridLayout( layGeneral, 1, 1 );
- layActive->setAlignment( Qt::AlignCenter );
- chkActive = new QCheckBox( i18n( "Active"), pgGeneral, "chkActive" );
- QToolTip::add( chkActive, i18n( "Select it to activate this account." ) );
+ TQGridLayout* layActive = new TQGridLayout( layGeneral, 1, 1 );
+ layActive->setAlignment( TQt::AlignCenter );
+ chkActive = new TQCheckBox( i18n( "Active"), pgGeneral, "chkActive" );
+ TQToolTip::add( chkActive, i18n( "Select it to activate this account." ) );
layActive->addWidget( chkActive, 0, 0 );
chkActive->setChecked( DEFAULT_ACCOUNT_ACTIVE );
//secure transfer groupbox and layouts
- QGroupBox* gboxSecureTransfer = new QGroupBox( 0, Qt::Horizontal, i18n( "Encryption" ), pgSecurity, "gboxSecureTransfer" );
- gboxSecureTransfer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum ) );
+ TQGroupBox* gboxSecureTransfer = new TQGroupBox( 0, TQt::Horizontal, i18n( "Encryption" ), pgSecurity, "gboxSecureTransfer" );
+ gboxSecureTransfer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ) );
laySecurity->addWidget( gboxSecureTransfer );
- QHBoxLayout* laySecureTransfer = new QHBoxLayout( gboxSecureTransfer->layout(), spacingHint() );
+ TQHBoxLayout* laySecureTransfer = new TQHBoxLayout( gboxSecureTransfer->layout(), spacingHint() );
//radio buttons to set secure transfer
- grpSecureTransfer = new QButtonGroup( NULL, "grpSecureTransfer" );
+ grpSecureTransfer = new TQButtonGroup( NULL, "grpSecureTransfer" );
connect( grpSecureTransfer, SIGNAL( clicked( int ) ), this, SLOT( slotSecureTransferChanged ( int ) ) );
- QRadioButton* btnSecureTransferNone = new QRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
- QRadioButton* btnSecureTransferSSL = new QRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );
- QRadioButton* btnSecureTransferTLS = new QRadioButton( i18n( "TLS" ), gboxSecureTransfer, "btnSecureTransferTLS" );
+ TQRadioButton* btnSecureTransferNone = new TQRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
+ TQRadioButton* btnSecureTransferSSL = new TQRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );
+ TQRadioButton* btnSecureTransferTLS = new TQRadioButton( i18n( "TLS" ), gboxSecureTransfer, "btnSecureTransferTLS" );
grpSecureTransfer->insert( btnSecureTransferNone, ID_BUTTON_SECTRANSFER_NONE );
grpSecureTransfer->insert( btnSecureTransferSSL, ID_BUTTON_SECTRANSFER_SSL );
grpSecureTransfer->insert( btnSecureTransferTLS, ID_BUTTON_SECTRANSFER_TLS );
- QToolTip::add( btnSecureTransferNone, i18n( "The download of the mail header and body will not be encrypted. Use this, if your provider doesn't make a secure transfer available." ) );
- QToolTip::add( btnSecureTransferSSL, i18n( "Secure Sockets Layer (SSL), is a cryptographic protocol that provides secure communications on the Internet." ) );
- QToolTip::add( btnSecureTransferTLS, i18n( "Transport Layer Security (TLS) is a cryptographic protocol that provides secure communications on the Internet. It is the successor of SSL." ) );
+ TQToolTip::add( btnSecureTransferNone, i18n( "The download of the mail header and body will not be encrypted. Use this, if your provider doesn't make a secure transfer available." ) );
+ TQToolTip::add( btnSecureTransferSSL, i18n( "Secure Sockets Layer (SSL), is a cryptographic protocol that provides secure communications on the Internet." ) );
+ TQToolTip::add( btnSecureTransferTLS, i18n( "Transport Layer Security (TLS) is a cryptographic protocol that provides secure communications on the Internet. It is the successor of SSL." ) );
laySecureTransfer->addWidget( btnSecureTransferNone );
laySecureTransfer->addWidget( btnSecureTransferSSL );
laySecureTransfer->addWidget( btnSecureTransferTLS );
@@ -202,7 +202,7 @@ void ServerDialog::slotOk( )
}
//get application config object (kshowmailrc)
- KConfig* config = KApplication::kApplication()->config();
+ TDEConfig* config = TDEApplication::kApplication()->config();
config->setGroup( txtAccount->text() );
@@ -216,8 +216,8 @@ void ServerDialog::slotOk( )
//therefore we use setText(). But if we use this method, KPasswordEdit::password()
//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
//will return the correct password
- QString pass;
- if( txtPassword->password() == "" || txtPassword->password() == QString::null )
+ TQString pass;
+ if( txtPassword->password() == "" || txtPassword->password() == TQString::null )
pass = txtPassword->text();
else
pass = txtPassword->password();
@@ -232,17 +232,17 @@ void ServerDialog::slotOk( )
switch( grpPasswordStorage->selectedId() )
{
case ID_BUTTON_PASSWORD_DONT_SAVE : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
- config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, QString::null );
+ config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
break;
case ID_BUTTON_PASSWORD_SAVE_FILE : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, crypt( url ) );
break;
case ID_BUTTON_PASSWORD_SAVE_KWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
- config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, QString::null );
+ config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
KWalletAccess::savePassword( txtAccount->text(), pass );
break;
default : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
- config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, QString::null );
+ config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
}
config->writeEntry( CONFIG_ENTRY_ACCOUNT_ACTIVE, chkActive->isChecked() );
@@ -274,7 +274,7 @@ void ServerDialog::fillDialog( )
txtAccount->setText( account->getAccountName() );
txtServer->setText( account->getHost() );
- QString proto = account->getProtocol( true );
+ TQString proto = account->getProtocol( true );
bool tls = account->getTLS();
if( proto == "POP3S" )
diff --git a/kshowmail/serverdialog.h b/kshowmail/serverdialog.h
index 2168003..fd3dca2 100644
--- a/kshowmail/serverdialog.h
+++ b/kshowmail/serverdialog.h
@@ -18,30 +18,30 @@
#ifndef SERVERDIALOG_H
#define SERVERDIALOG_H
-//Qt headers
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
+//TQt headers
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqtooltip.h>
+#include <ntqspinbox.h>
+#include <ntqgroupbox.h>
+#include <ntqbuttongroup.h>
+#include <ntqradiobutton.h>
+#include <ntqcheckbox.h>
//KDE headers
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
//KShowmail headers
#include "configelem.h"
#include "constants.h"
#include "encryption.h"
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
#include <ktabwidget.h>
//radio button IDs
@@ -73,7 +73,7 @@ class ServerDialog : public KDialogBase
* @param parent parent of the dialog
* @param item account to setup
*/
- ServerDialog( QWidget* parent, ConfigElem* item = NULL );
+ ServerDialog( TQWidget* parent, ConfigElem* item = NULL );
/**
* Destructor
@@ -105,7 +105,7 @@ class ServerDialog : public KDialogBase
/**
* Spinbox to choose the tcp port.
*/
- QSpinBox* spbPort;
+ TQSpinBox* spbPort;
/**
* Edit line which contains the user name.
@@ -120,17 +120,17 @@ class ServerDialog : public KDialogBase
/**
* Check box to select whether the account is active or not.
*/
- QCheckBox* chkActive;
+ TQCheckBox* chkActive;
/**
* Combines the radio buttons of password storage.
*/
- QButtonGroup* grpPasswordStorage;
+ TQButtonGroup* grpPasswordStorage;
/**
* Combines the radio buttons of secure transfer.
*/
- QButtonGroup* grpSecureTransfer;
+ TQButtonGroup* grpSecureTransfer;
protected slots:
diff --git a/kshowmail/showheaderdialog.cpp b/kshowmail/showheaderdialog.cpp
index 829fa98..d94f46e 100644
--- a/kshowmail/showheaderdialog.cpp
+++ b/kshowmail/showheaderdialog.cpp
@@ -11,21 +11,21 @@
//
#include "showheaderdialog.h"
-ShowHeaderDialog::ShowHeaderDialog( QWidget * parent, QString & caption, QString & subject, QString header ) :
+ShowHeaderDialog::ShowHeaderDialog( TQWidget * parent, TQString & caption, TQString & subject, TQString header ) :
KDialogBase( parent, "showheaderdialog", true, caption, KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true )
{
//create main widget
- QWidget* mainWidget = new QWidget( this );
+ TQWidget* mainWidget = new TQWidget( this );
setMainWidget( mainWidget );
//this layout seperates meta data area (subject) from the mail header area
- QVBoxLayout* layMain = new QVBoxLayout( mainWidget, 0, spacingHint() );
+ TQVBoxLayout* layMain = new TQVBoxLayout( mainWidget, 0, spacingHint() );
//this layout arranges the labels and lines for the meta datas
- QHBoxLayout* layMetaDatas = new QHBoxLayout( layMain, spacingHint() );
+ TQHBoxLayout* layMetaDatas = new TQHBoxLayout( layMain, spacingHint() );
//create label for subject
- QLabel* lblSubject = new QLabel( i18n( "Subject:" ), mainWidget, "lblSubject" );
+ TQLabel* lblSubject = new TQLabel( i18n( "Subject:" ), mainWidget, "lblSubject" );
layMetaDatas->addWidget( lblSubject );
//create line edit for subject
diff --git a/kshowmail/showheaderdialog.h b/kshowmail/showheaderdialog.h
index c337c8b..9fa2fab 100644
--- a/kshowmail/showheaderdialog.h
+++ b/kshowmail/showheaderdialog.h
@@ -13,12 +13,12 @@
#define SHOWHEADERDIALOG_H
//QT headers
-#include <qlayout.h>
-#include <qlabel.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
//KDE headers
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <ktextedit.h>
@@ -42,7 +42,7 @@ Q_OBJECT
* @param subject mail subject
* @param header mail header
*/
- ShowHeaderDialog( QWidget* parent, QString& caption, QString& subject, QString header );
+ ShowHeaderDialog( TQWidget* parent, TQString& caption, TQString& subject, TQString header );
/**
* Destructor
diff --git a/kshowmail/showlistviewitem.cpp b/kshowmail/showlistviewitem.cpp
index e95ce94..4835470 100644
--- a/kshowmail/showlistviewitem.cpp
+++ b/kshowmail/showlistviewitem.cpp
@@ -17,20 +17,20 @@
#include "showlistviewitem.h"
-ShowListViewItem::ShowListViewItem (QListView * parent,
+ShowListViewItem::ShowListViewItem (TQListView * parent,
ShowListViewItem* after):
-QListViewItem (parent, after)
+TQListViewItem (parent, after)
{}
-ShowListViewItem::ShowListViewItem( QListView * parent ) :
- QListViewItem( parent )
+ShowListViewItem::ShowListViewItem( TQListView * parent ) :
+ TQListViewItem( parent )
{
}
ShowListViewItem::~ShowListViewItem()
{}
-QString ShowListViewItem::key (int column, bool /*ascending*/) const
+TQString ShowListViewItem::key (int column, bool /*ascending*/) const
{
switch (column)
{
@@ -47,7 +47,7 @@ QString ShowListViewItem::key (int column, bool /*ascending*/) const
* reimplement compare to solve bug #856005
* standard compare is locale dependant
*/
-int ShowListViewItem::compare( QListViewItem *i, int col,
+int ShowListViewItem::compare( TQListViewItem *i, int col,
bool ascending ) const
{
if( col == _colNumber )
@@ -62,52 +62,52 @@ int ShowListViewItem::compare( QListViewItem *i, int col,
return key( col, ascending ).compare( i->key( col, ascending) );
}
-void ShowListViewItem::setNumber (const QString& number)
+void ShowListViewItem::setNumber (const TQString& number)
{
setText (_colNumber, number);
}
-void ShowListViewItem::setAccount(const QString& account)
+void ShowListViewItem::setAccount(const TQString& account)
{
setText (_colAccount, account);
}
-void ShowListViewItem::setFrom(const QString& from)
+void ShowListViewItem::setFrom(const TQString& from)
{
setText (_colFrom, from);
}
-void ShowListViewItem::setTo(const QString& to)
+void ShowListViewItem::setTo(const TQString& to)
{
setText (_colTo, to);
}
-void ShowListViewItem::setSubject(const QString& subject)
+void ShowListViewItem::setSubject(const TQString& subject)
{
setText (_colSubject, subject);
}
-void ShowListViewItem::setDate(const QString& date)
+void ShowListViewItem::setDate(const TQString& date)
{
setText (_colDate, date);
}
-void ShowListViewItem::setSize(const QString& size)
+void ShowListViewItem::setSize(const TQString& size)
{
setText (_colSize, size);
}
-void ShowListViewItem::setContent(const QString& content)
+void ShowListViewItem::setContent(const TQString& content)
{
setText (_colContent, content);
}
-void ShowListViewItem::setState(const QString& state)
+void ShowListViewItem::setState(const TQString& state)
{
setText (_colState, state);
}
-void ShowListViewItem::setTime (const QString& time)
+void ShowListViewItem::setTime (const TQString& time)
{
m_time = time;
}
diff --git a/kshowmail/showlistviewitem.h b/kshowmail/showlistviewitem.h
index 0f56f1b..12d3ce9 100644
--- a/kshowmail/showlistviewitem.h
+++ b/kshowmail/showlistviewitem.h
@@ -18,13 +18,13 @@
#ifndef SHOWLISTVIEWITEM_H
#define SHOWLISTVIEWITEM_H
-#include <qlistview.h>
+#include <ntqlistview.h>
/**
*@author Eggert Ehmke
*/
-class ShowListViewItem : public QListViewItem
+class ShowListViewItem : public TQListViewItem
{
public:
@@ -33,36 +33,36 @@ public:
* @param parent mail list view
* @param after insert the new item after this item
*/
- ShowListViewItem (QListView * parent, ShowListViewItem * after);
+ ShowListViewItem (TQListView * parent, ShowListViewItem * after);
/**
* Constructor
* @param parent mail list view
*/
- ShowListViewItem( QListView* parent );
+ ShowListViewItem( TQListView* parent );
virtual ~ShowListViewItem();
- virtual QString key (int column, bool ascending) const;
+ virtual TQString key (int column, bool ascending) const;
/**
* reimplement compare to solve bug #856005
* standard compare is locale dependant
*/
- virtual int compare( QListViewItem *i, int col, bool ascending ) const;
- void setNumber (const QString&);
- void setAccount(const QString&);
- void setFrom(const QString&);
- void setTo(const QString&);
- void setSubject(const QString&);
- void setDate(const QString&);
- void setSize(const QString&);
- void setContent(const QString&);
- void setState(const QString&);
- void setTime (const QString&);
+ virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
+ void setNumber (const TQString&);
+ void setAccount(const TQString&);
+ void setFrom(const TQString&);
+ void setTo(const TQString&);
+ void setSubject(const TQString&);
+ void setDate(const TQString&);
+ void setSize(const TQString&);
+ void setContent(const TQString&);
+ void setState(const TQString&);
+ void setTime (const TQString&);
enum {_colNumber, _colAccount, _colFrom, _colTo, _colSubject, _colDate,
_colSize, _colContent, _colState};
private:
- QString m_time;
+ TQString m_time;
};
diff --git a/kshowmail/showmaildialog.cpp b/kshowmail/showmaildialog.cpp
index 1d911db..daaf5f8 100644
--- a/kshowmail/showmaildialog.cpp
+++ b/kshowmail/showmaildialog.cpp
@@ -11,32 +11,32 @@
//
#include "showmaildialog.h"
-ShowMailDialog::ShowMailDialog( QWidget * parent, QString & caption, bool allowHTML, QString & sender, QString & date, QString & size, QString & subject, QString & body ) :
+ShowMailDialog::ShowMailDialog( TQWidget * parent, TQString & caption, bool allowHTML, TQString & sender, TQString & date, TQString & size, TQString & subject, TQString & body ) :
KDialogBase( parent, "showmaildialog", true, caption, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1, KDialogBase::Ok, true, KGuiItem( i18n( "Reply" ), "mail_reply" ) )
{
//create main widget
- QWidget* mainWidget = new QWidget( this );
+ TQWidget* mainWidget = new TQWidget( this );
setMainWidget( mainWidget );
//this layout seperates meta data area (date, subject, and so on) from the mail body area
- QVBoxLayout* layMain = new QVBoxLayout( mainWidget, 0, spacingHint() );
+ TQVBoxLayout* layMain = new TQVBoxLayout( mainWidget, 0, spacingHint() );
//this layouts arranges the labels and lines for the meta data
- QHBoxLayout* layMetaDatas = new QHBoxLayout( layMain, spacingHint() );
- QVBoxLayout* layLabels = new QVBoxLayout( layMetaDatas, spacingHint() );
- QVBoxLayout* layLines = new QVBoxLayout( layMetaDatas, spacingHint() );
+ TQHBoxLayout* layMetaDatas = new TQHBoxLayout( layMain, spacingHint() );
+ TQVBoxLayout* layLabels = new TQVBoxLayout( layMetaDatas, spacingHint() );
+ TQVBoxLayout* layLines = new TQVBoxLayout( layMetaDatas, spacingHint() );
//create labels for meta data
- QLabel* lblSender = new QLabel( i18n( "Sender:" ), mainWidget, "lblSender" );
+ TQLabel* lblSender = new TQLabel( i18n( "Sender:" ), mainWidget, "lblSender" );
layLabels->addWidget( lblSender );
- QLabel* lblDate = new QLabel( i18n( "Date:" ), mainWidget, "lblDate" );
+ TQLabel* lblDate = new TQLabel( i18n( "Date:" ), mainWidget, "lblDate" );
layLabels->addWidget( lblDate );
- QLabel* lblSize = new QLabel( i18n( "Size:" ), mainWidget, "lblSize" );
+ TQLabel* lblSize = new TQLabel( i18n( "Size:" ), mainWidget, "lblSize" );
layLabels->addWidget( lblSize );
- QLabel* lblSubject = new QLabel( i18n( "Subject:" ), mainWidget, "lblSubject" );
+ TQLabel* lblSubject = new TQLabel( i18n( "Subject:" ), mainWidget, "lblSubject" );
layLabels->addWidget( lblSubject );
//create edit lines to show the meta data
@@ -81,7 +81,7 @@ ShowMailDialog::~ShowMailDialog()
void ShowMailDialog::slotUser1( )
{
//make copy of body to manipulate
- QString body = m_body;
+ TQString body = m_body;
//add '>' at front of every line
body.insert( 0, "> " );
diff --git a/kshowmail/showmaildialog.h b/kshowmail/showmaildialog.h
index 39890b0..d2b3f3a 100644
--- a/kshowmail/showmaildialog.h
+++ b/kshowmail/showmaildialog.h
@@ -13,17 +13,17 @@
#define SHOWMAILDIALOG_H
//QT headers
-#include <qlayout.h>
-#include <qlabel.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
//KDE headers
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <klineedit.h>
#include <kdebug.h>
#include <ktextbrowser.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
//KShowmail headers
#include "constants.h"
@@ -51,7 +51,7 @@ public:
* @param subject mail subject
* @param body mail body
*/
- ShowMailDialog( QWidget* parent, QString& caption, bool allowHTML, QString& sender, QString& date, QString& size, QString& subject, QString& body );
+ ShowMailDialog( TQWidget* parent, TQString& caption, bool allowHTML, TQString& sender, TQString& date, TQString& size, TQString& subject, TQString& body );
/**
* Destructor
@@ -64,19 +64,19 @@ private:
* mail subject
* Stored by constructor and used by slotUser1.
*/
- QString m_subject;
+ TQString m_subject;
/**
* mail body
* Stored by constructor and used by slotUser1.
*/
- QString m_body;
+ TQString m_body;
/**
* mail sender
* Stored by constructor and used by slotUser1.
*/
- QString m_sender;
+ TQString m_sender;
/**
* Overloaded methode of KDialogBase.
diff --git a/kshowmail/showrecord.cpp b/kshowmail/showrecord.cpp
index b5df70a..ca3087f 100644
--- a/kshowmail/showrecord.cpp
+++ b/kshowmail/showrecord.cpp
@@ -31,7 +31,7 @@ ShowRecord::~ShowRecord()
{
}
-void ShowRecord::saveOptions( QDomDocument& doc, QDomElement& parent )
+void ShowRecord::saveOptions( TQDomDocument& doc, TQDomElement& parent )
{
//Loop over all mail items
for( ShowRecordElem* pElem = first(); pElem; pElem = next() )
@@ -41,19 +41,19 @@ void ShowRecord::saveOptions( QDomDocument& doc, QDomElement& parent )
}
}
-void ShowRecord::readStoredMails( QDomElement& parent )
+void ShowRecord::readStoredMails( TQDomElement& parent )
{
//clear the list
clear();
//get first DOM node (mail)
- QDomNode n = parent.firstChild();
+ TQDomNode n = parent.firstChild();
//iterate over all mail items stored in the given account
while( !n.isNull() )
{
//get element of the current node
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
//create mail object
ShowRecordElem* pElem = new ShowRecordElem();
@@ -94,7 +94,7 @@ MailNumberList_Type ShowRecord::getSelectedMails( )
{
MailNumberList_Type list; //contains the numbers of selected mails
ShowRecordElem* mail; //mail from which we want to get the number (if selected)
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
//iterate over all mails
while( ( mail = it.current() ) != NULL )
@@ -112,7 +112,7 @@ MailNumberList_Type ShowRecord::getSelectedMails( )
void ShowRecord::removeMail( int number )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
//looking for the mail with the number 'number'
@@ -127,10 +127,10 @@ void ShowRecord::removeMail( int number )
}
}
-QStringList ShowRecord::getSelectedSubjects( ) const
+TQStringList ShowRecord::getSelectedSubjects( ) const
{
- QStringList subjects; //contains the subjects
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQStringList subjects; //contains the subjects
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
//iterate over all mails
@@ -147,12 +147,12 @@ QStringList ShowRecord::getSelectedSubjects( ) const
return subjects;
}
-QString ShowRecord::getSenderOf( int number ) const
+TQString ShowRecord::getSenderOf( int number ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString sender; //sender of the wanted mail
+ TQString sender; //sender of the wanted mail
//looking for the mail with the number 'number'
while( ( mail = it.current() ) != NULL && !found )
@@ -170,12 +170,12 @@ QString ShowRecord::getSenderOf( int number ) const
return sender;
}
-QString ShowRecord::getDateOf( int number ) const
+TQString ShowRecord::getDateOf( int number ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString date; //sent date of the wanted mail
+ TQString date; //sent date of the wanted mail
//looking for the mail with the number 'number'
while( ( mail = it.current() ) != NULL && !found )
@@ -194,12 +194,12 @@ QString ShowRecord::getDateOf( int number ) const
}
-QString ShowRecord::getSizeOf( int number ) const
+TQString ShowRecord::getSizeOf( int number ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString size; //size of the wanted mail
+ TQString size; //size of the wanted mail
//looking for the mail with the number 'number'
while( ( mail = it.current() ) != NULL && !found )
@@ -218,12 +218,12 @@ QString ShowRecord::getSizeOf( int number ) const
}
-QString ShowRecord::getSubjectOf( int number ) const
+TQString ShowRecord::getSubjectOf( int number ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString subject; //subject of the wanted mail
+ TQString subject; //subject of the wanted mail
//looking for the mail with the number 'number'
while( ( mail = it.current() ) != NULL && !found )
@@ -242,12 +242,12 @@ QString ShowRecord::getSubjectOf( int number ) const
}
-QString ShowRecord::decodeMailBody( QByteArray body, int number, bool preferHTML ) const
+TQString ShowRecord::decodeMailBody( TQByteArray body, int number, bool preferHTML ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString mailbody; //decoded mail
+ TQString mailbody; //decoded mail
//looking for the mail with the number 'number'
while( ( mail = it.current() ) != NULL && !found )
@@ -266,9 +266,9 @@ QString ShowRecord::decodeMailBody( QByteArray body, int number, bool preferHTML
}
-bool ShowRecord::hasMail( QString uid )
+bool ShowRecord::hasMail( TQString uid )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -286,7 +286,7 @@ bool ShowRecord::hasMail( QString uid )
return found;
}
-void ShowRecord::appendNewMail( int number, QString uid, bool isNew )
+void ShowRecord::appendNewMail( int number, TQString uid, bool isNew )
{
//create new mail
ShowRecordElem* newMail = new ShowRecordElem( number, uid, isNew );
@@ -298,7 +298,7 @@ void ShowRecord::appendNewMail( int number, QString uid, bool isNew )
void ShowRecord::printMailList( )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
while( ( mail = it.current() ) )
@@ -314,7 +314,7 @@ void ShowRecord::printMailList( )
void ShowRecord::setSize( int number, long size )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -337,7 +337,7 @@ Types::MailNumberList_Type ShowRecord::getNewMails( )
{
MailNumberList_Type list; //contains the numbers of the new mails
ShowRecordElem* mail; //mail from which we want to get the number (if new)
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
//iterate over all mails
while( ( mail = it.current() ) != NULL )
@@ -353,9 +353,9 @@ Types::MailNumberList_Type ShowRecord::getNewMails( )
return list;
}
-void ShowRecord::setHeader( int number, QString header )
+void ShowRecord::setHeader( int number, TQString header )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -374,11 +374,11 @@ void ShowRecord::setHeader( int number, QString header )
}
}
-QStringList ShowRecord::getUIDsOfOldMails( )
+TQStringList ShowRecord::getUIDsOfOldMails( )
{
- QStringList list; //contains the UIDs of the old mails
+ TQStringList list; //contains the UIDs of the old mails
ShowRecordElem* mail; //mail from which we want to get the uid (if old)
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
//iterate over all mails
while( ( mail = it.current() ) != NULL )
@@ -394,12 +394,12 @@ QStringList ShowRecord::getUIDsOfOldMails( )
return list;
}
-QString ShowRecord::getHeaderOf( QString uid )
+TQString ShowRecord::getHeaderOf( TQString uid )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
- QString header; //header of the wanted mail
+ TQString header; //header of the wanted mail
//looking for the mail with the UID 'uid'
while( ( mail = it.current() ) != NULL && !found )
@@ -417,9 +417,9 @@ QString ShowRecord::getHeaderOf( QString uid )
return header;
}
-void ShowRecord::setHeader( QString uid, QString header )
+void ShowRecord::setHeader( TQString uid, TQString header )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -440,7 +440,7 @@ void ShowRecord::setHeader( QString uid, QString header )
int ShowRecord::getNumberNewMails( )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
int number = 0; //number of new mails
@@ -464,7 +464,7 @@ int ShowRecord::getNumberMails( )
long ShowRecord::getTotalSize( )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
long size = 0; //total size of all mails
@@ -479,9 +479,9 @@ long ShowRecord::getTotalSize( )
return size;
}
-void ShowRecord::fillMailListView( KshowmailView * view, QString & account )
+void ShowRecord::fillMailListView( KshowmailView * view, TQString & account )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
//iterate over all mails and order the mail to create a list view item
@@ -491,23 +491,23 @@ void ShowRecord::fillMailListView( KshowmailView * view, QString & account )
++it;
//insert list view item
- QString number = QString( "%1" ).arg( mail->number() );
- QString from = mail->from();
- QString to = mail->to();
- QString subject = mail->subject();
- QString date = mail->date();
- QString size = QString( "%1" ).arg( mail->size() );
- QString content = mail->content();
- QString state = mail->state();
- QString time = mail->strUnixTime();
+ TQString number = TQString( "%1" ).arg( mail->number() );
+ TQString from = mail->from();
+ TQString to = mail->to();
+ TQString subject = mail->subject();
+ TQString date = mail->date();
+ TQString size = TQString( "%1" ).arg( mail->size() );
+ TQString content = mail->content();
+ TQString state = mail->state();
+ TQString time = mail->strUnixTime();
mail->setViewItem( view->insertMail( number, account, from, to, subject, date, size, content, state, time ) );
}
}
-int ShowRecord::showSelectedHeaders( QString& account )
+int ShowRecord::showSelectedHeaders( TQString& account )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
int showNextHeader = ShowRecordElem::continueShowHeaders; //return value of ShowRecordElem::showHeader()
@@ -524,9 +524,9 @@ int ShowRecord::showSelectedHeaders( QString& account )
return showNextHeader == ShowRecordElem::continueShowHeaders ? ShowRecord::continueShowHeaders : ShowRecord::cancelShowHeaders;
}
-bool ShowRecord::isNew( QString uid ) const
+bool ShowRecord::isNew( TQString uid ) const
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
bool newMail = false; //at time we have not found it, therefore the return value is false
@@ -547,7 +547,7 @@ bool ShowRecord::isNew( QString uid ) const
return newMail;
}
-void ShowRecord::applyHeaderFilter( HeaderFilter * filter, QString account, MailNumberList_Type& deleteList, MailToDownloadMap_Type& downloadList, int& nmbIgnoredMails, FilterLog* log )
+void ShowRecord::applyHeaderFilter( HeaderFilter * filter, TQString account, MailNumberList_Type& deleteList, MailToDownloadMap_Type& downloadList, int& nmbIgnoredMails, FilterLog* log )
{
MailNumberList_Type mailsToIgnore; //this list holds the numbers of all mails, which shall be ignored
@@ -556,7 +556,7 @@ void ShowRecord::applyHeaderFilter( HeaderFilter * filter, QString account, Mail
for( ShowRecordElem* pElem = first(); pElem; pElem = next() )
{
//apply the filters to the current mail
- QString mailbox;
+ TQString mailbox;
FilterAction_Type action = pElem->applyHeaderFilter( filter, account, mailbox, log );
//do recommend action
@@ -585,9 +585,9 @@ void ShowRecord::applyHeaderFilter( HeaderFilter * filter, QString account, Mail
}
-void ShowRecord::writeToMoveLog( FilterLog * log, int number, QString account, QString mailbox )
+void ShowRecord::writeToMoveLog( FilterLog * log, int number, TQString account, TQString mailbox )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -606,9 +606,9 @@ void ShowRecord::writeToMoveLog( FilterLog * log, int number, QString account, Q
}
}
-void ShowRecord::writeToDeleteLog( FilterLog * log, int number, QString account )
+void ShowRecord::writeToDeleteLog( FilterLog * log, int number, TQString account )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -629,7 +629,7 @@ void ShowRecord::writeToDeleteLog( FilterLog * log, int number, QString account
void ShowRecord::setMarkAtNextViewRefresh( int number )
{
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
bool found = false; //True, when the wanted mail was found
@@ -648,10 +648,10 @@ void ShowRecord::setMarkAtNextViewRefresh( int number )
}
}
-QStringList ShowRecord::getSelectedSenders( ) const
+TQStringList ShowRecord::getSelectedSenders( ) const
{
- QStringList senders; //contains the senders
- QPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
+ TQStringList senders; //contains the senders
+ TQPtrListIterator<ShowRecordElem> it( *this ); //iterator for the mail list
ShowRecordElem* mail; //current mail
//iterate over all mails
diff --git a/kshowmail/showrecord.h b/kshowmail/showrecord.h
index db783f2..87fda3f 100644
--- a/kshowmail/showrecord.h
+++ b/kshowmail/showrecord.h
@@ -21,9 +21,9 @@
//C++ header
#include <iostream>
-//Qt headers
-#include <qdom.h>
-#include <qptrlist.h>
+//TQt headers
+#include <ntqdom.h>
+#include <ntqptrlist.h>
//KDE headers
#include <kstandarddirs.h>
@@ -47,13 +47,13 @@ class KshowmailView;
* @short List which contains all mails of an account.
*
* The mails are objects of ShowRecordElem.
- * Inherits QPtrList.
+ * Inherits TQPtrList.
*
* @see ShowRecordElem
* @author Eggert Ehmke
* @author Ulrich Weigelt
*/
-class ShowRecord: public QPtrList<ShowRecordElem>
+class ShowRecord: public TQPtrList<ShowRecordElem>
{
public:
@@ -87,7 +87,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param doc DOM document in that all options are stored
* @param parent account element
*/
- void saveOptions( QDomDocument& doc, QDomElement& parent );
+ void saveOptions( TQDomDocument& doc, TQDomElement& parent );
/**
* Reads out all mails stored inside the given account element,
@@ -95,7 +95,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* this list. All old items will be removed.
* @param parent account element (DOM element)
*/
- void readStoredMails( QDomElement& parent );
+ void readStoredMails( TQDomElement& parent );
/**
* Apply the filters to the mails in this list.
@@ -106,7 +106,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param nmbIgnoredMails reference to an integer in which it writes the number of ignored mails
* @param log pointer to the filter log
*/
- void applyHeaderFilter( HeaderFilter* filter, QString account, MailNumberList_Type& deleteList, MailToDownloadMap_Type& downloadList, int& nmbIgnoredMails, FilterLog* log = NULL );
+ void applyHeaderFilter( HeaderFilter* filter, TQString account, MailNumberList_Type& deleteList, MailToDownloadMap_Type& downloadList, int& nmbIgnoredMails, FilterLog* log = NULL );
/**
@@ -133,35 +133,35 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* Returns the subjects of the selected mails.
* @return subjects of selected mails
*/
- QStringList getSelectedSubjects() const;
+ TQStringList getSelectedSubjects() const;
/**
* Returns the sender of the mail with the given number.
* @param number mail number
* @return sender
*/
- QString getSenderOf( int number ) const;
+ TQString getSenderOf( int number ) const;
/**
* Returns the date of sent of the mail with the given number.
* @param number mail number
* @return date
*/
- QString getDateOf( int number ) const;
+ TQString getDateOf( int number ) const;
/**
* Returns the size of the mail with the given number.
* @param number mail number
* @return size
*/
- QString getSizeOf( int number ) const;
+ TQString getSizeOf( int number ) const;
/**
* Returns the subject of the mail with the given number.
* @param number mail number
* @return subject
*/
- QString getSubjectOf( int number ) const;
+ TQString getSubjectOf( int number ) const;
/**
* Decodes the given mail body by the appropriate mail object.
@@ -175,7 +175,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param preferHTML decode HTML part if present
* @return decoded mail body
*/
- QString decodeMailBody( QByteArray body, int number, bool preferHTML ) const;
+ TQString decodeMailBody( TQByteArray body, int number, bool preferHTML ) const;
/**
* Returns whether there is mail with the given uid in the list.
@@ -183,7 +183,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @return TRUE - mail is in the list
* @return FALSE - mail is not in the list
*/
- bool hasMail( QString uid );
+ bool hasMail( TQString uid );
/**
* Returns whether the given mail is new.
@@ -191,7 +191,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @return TRUE - mail is new
* @return FALSE - mail is not new or mail doesn't exist
*/
- bool isNew( QString uid ) const;
+ bool isNew( TQString uid ) const;
/**
* Appends a new mail to the list.
@@ -199,7 +199,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param uid Unique ID of the mail
* @param isNew TRUE - mail is new; FALSE - mail is not new
*/
- void appendNewMail( int number, QString uid, bool isNew );
+ void appendNewMail( int number, TQString uid, bool isNew );
/**
* Just for debugging.
@@ -225,27 +225,27 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param number number of the mail
* @param header the header
*/
- void setHeader( int number, QString header );
+ void setHeader( int number, TQString header );
/**
* Returns a list of the UIDs of all old mails.
* @return UIDs of all old mails
*/
- QStringList getUIDsOfOldMails();
+ TQStringList getUIDsOfOldMails();
/**
* Returns the header of the mail with the given UID.
* @param uid UID
* @return mail header
*/
- QString getHeaderOf( QString uid );
+ TQString getHeaderOf( TQString uid );
/**
* Sets the header of the mail with the given UID.
* @param uid UID
* @param header mail header
*/
- void setHeader( QString uid, QString header );
+ void setHeader( TQString uid, TQString header );
/**
* Returns the number of new mails.
@@ -271,7 +271,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param view pointer to the application view
* @param account account name
*/
- void fillMailListView( KshowmailView* view, QString& account );
+ void fillMailListView( KshowmailView* view, TQString& account );
/**
* Shows the headers of all selected mails.
@@ -279,7 +279,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @return continueShowHeaders - the user has always clicked OK. The invoking function will show the next header
* @return cancelShowHeaders - the user has clicked Cancel. The invoking function will not show the next header.
*/
- int showSelectedHeaders( QString& account );
+ int showSelectedHeaders( TQString& account );
/**
* Writes the mail into the Move Log.
@@ -288,7 +288,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param account name of the account
* @param mailbox name of the mailbox
*/
- void writeToMoveLog( FilterLog* log, int number, QString account, QString mailbox );
+ void writeToMoveLog( FilterLog* log, int number, TQString account, TQString mailbox );
/**
* Writes the mail into the Delete Log.
@@ -296,7 +296,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* @param number number of the mail
* @param account name of the account
*/
- void writeToDeleteLog( FilterLog* log, int number, QString account );
+ void writeToDeleteLog( FilterLog* log, int number, TQString account );
/**
* The given mail will be marked at the next view refresh.
@@ -308,7 +308,7 @@ class ShowRecord: public QPtrList<ShowRecordElem>
* Returns the senders of the selected mails
* @return senders of the selected mails
*/
- QStringList getSelectedSenders() const;
+ TQStringList getSelectedSenders() const;
};
#endif
diff --git a/kshowmail/showrecordelem.cpp b/kshowmail/showrecordelem.cpp
index 63f5157..9edc834 100644
--- a/kshowmail/showrecordelem.cpp
+++ b/kshowmail/showrecordelem.cpp
@@ -34,7 +34,7 @@ ShowRecordElem::ShowRecordElem ()
markAtViewRefresh = false;
}
-ShowRecordElem::ShowRecordElem( int number, QString& uid, bool isNew )
+ShowRecordElem::ShowRecordElem( int number, TQString& uid, bool isNew )
{
//set default values
m_from = "???";
@@ -50,15 +50,15 @@ ShowRecordElem::ShowRecordElem( int number, QString& uid, bool isNew )
}
-QCString ShowRecordElem::scanHeader( const QString& item ) const
+TQCString ShowRecordElem::scanHeader( const TQString& item ) const
{
- QCString headerline( "" ); //found header line
+ TQCString headerline( "" ); //found header line
//get e.g. the "From:" line, starting with cr,lf,"From:" and ending
//with a carriage return
//build the search string
- QString searchstring( QString( "\r\n%1:" ).arg( item ) );
+ TQString searchstring( TQString( "\r\n%1:" ).arg( item ) );
//searching...
int pos1 = m_header.find( searchstring, 0, FALSE );
@@ -74,32 +74,32 @@ QCString ShowRecordElem::scanHeader( const QString& item ) const
return headerline;
}
-void ShowRecordElem::setHeader( const QString& header )
+void ShowRecordElem::setHeader( const TQString& header )
{
//store given header
m_header = header.ascii();
//extract sender and store it
- QCString from = scanHeader( "From" );
+ TQCString from = scanHeader( "From" );
from = from.simplifyWhiteSpace();
setFrom( from );
//extract addressee and store it
- QCString to = scanHeader( "To" );
+ TQCString to = scanHeader( "To" );
to = to.simplifyWhiteSpace();
setTo (to);
//extract subject and store it
- QCString subject = scanHeader( "Subject" );
+ TQCString subject = scanHeader( "Subject" );
subject = subject.simplifyWhiteSpace();
setSubject( subject );
//extract date and store it
- QCString date = scanHeader( "Date" );
+ TQCString date = scanHeader( "Date" );
setDate( date );
//extract content type
- QCString content = scanHeader( "Content-Type" );
+ TQCString content = scanHeader( "Content-Type" );
content = content.simplifyWhiteSpace ();
//remove the stuff after the content type; see RFC 2045
@@ -113,7 +113,7 @@ void ShowRecordElem::setHeader( const QString& header )
setContent (content);
}
-void ShowRecordElem::setDate( const QCString& date )
+void ShowRecordElem::setDate( const TQCString& date )
{
DwDateTime dwDate; //this class represents an RFC-822 date-time;
//see mimelib/datetime.h
@@ -124,37 +124,37 @@ void ShowRecordElem::setDate( const QCString& date )
m_unixDate.setTime_t( dwDate.AsUnixTime() );
}
-QString ShowRecordElem::from() const
+TQString ShowRecordElem::from() const
{
return Codecs::decodeRFC2047( m_from );
}
-QString ShowRecordElem::to() const
+TQString ShowRecordElem::to() const
{
return Codecs::decodeRFC2047( m_to );
}
-QString ShowRecordElem::subject() const
+TQString ShowRecordElem::subject() const
{
return Codecs::decodeRFC2047( m_subject );
}
-QString ShowRecordElem::date() const
+TQString ShowRecordElem::date() const
{
- return KGlobal::locale()->formatDateTime( m_unixDate, true, true );
+ return TDEGlobal::locale()->formatDateTime( m_unixDate, true, true );
}
-QString ShowRecordElem::strUnixTime() const
+TQString ShowRecordElem::strUnixTime() const
{
- return m_unixDate.toString( Qt::ISODate );
+ return m_unixDate.toString( TQt::ISODate );
}
-QString ShowRecordElem::strSize() const
+TQString ShowRecordElem::strSize() const
{
- return QString( "%1" ).arg( m_size, 8 );
+ return TQString( "%1" ).arg( m_size, 8 );
}
-QString ShowRecordElem::state() const
+TQString ShowRecordElem::state() const
{
if( m_new )
return i18n( "new" );
@@ -162,21 +162,21 @@ QString ShowRecordElem::state() const
return i18n( "old" );
}
-void ShowRecordElem::saveOptions( QDomDocument& doc, QDomElement& parent )
+void ShowRecordElem::saveOptions( TQDomDocument& doc, TQDomElement& parent )
{
//build item tag of this mail( with mail number)
- QString hdr = QString( ITEM_MESSAGE );
+ TQString hdr = TQString( ITEM_MESSAGE );
hdr.append( "%1" );
hdr = hdr.arg( m_nNumber );
//create a new element and store the mail meta data in it
- QDomElement elem = doc.createElement( hdr );
+ TQDomElement elem = doc.createElement( hdr );
elem.setAttribute( ATTRIBUTE_MAIL_NUMBER, m_nNumber );
elem.setAttribute( ATTRIBUTE_MAIL_SIZE, m_size );
elem.setAttribute( ATTRIBUTE_MAIL_UID, m_uid );
//create a sub element for the mail header in store the header in it
- QDomElement subelem = doc.createElement( ITEM_MAIL_HEADER );
+ TQDomElement subelem = doc.createElement( ITEM_MAIL_HEADER );
subelem.appendChild( doc.createTextNode( m_header ) );
//add header element to the mail element
@@ -186,7 +186,7 @@ void ShowRecordElem::saveOptions( QDomDocument& doc, QDomElement& parent )
parent.appendChild( elem );
}
-void ShowRecordElem::readOptions( QDomElement& elem )
+void ShowRecordElem::readOptions( TQDomElement& elem )
{
//get number, size and uid
setNumber( elem.attribute( ATTRIBUTE_MAIL_NUMBER ).toInt() );
@@ -194,7 +194,7 @@ void ShowRecordElem::readOptions( QDomElement& elem )
setUIDL( elem.attribute( ATTRIBUTE_MAIL_UID ) );
//search for the header item and read it
- QDomElement subelem = elem.namedItem( ITEM_MAIL_HEADER ).toElement();
+ TQDomElement subelem = elem.namedItem( ITEM_MAIL_HEADER ).toElement();
setHeader( subelem.text() );
//the mail is not new
@@ -202,37 +202,37 @@ void ShowRecordElem::readOptions( QDomElement& elem )
}
-void ShowRecordElem::setFrom( const QCString & from )
+void ShowRecordElem::setFrom( const TQCString & from )
{
m_from = from;
}
-void ShowRecordElem::setTo( const QCString & to )
+void ShowRecordElem::setTo( const TQCString & to )
{
m_to = to;
}
-void ShowRecordElem::setSubject( const QCString & subject )
+void ShowRecordElem::setSubject( const TQCString & subject )
{
m_subject = subject;
}
-void ShowRecordElem::setContent( const QCString& content )
+void ShowRecordElem::setContent( const TQCString& content )
{
m_content = content;
}
-QString ShowRecordElem::header( ) const
+TQString ShowRecordElem::header( ) const
{
- return QString( m_header );
+ return TQString( m_header );
}
-void ShowRecordElem::setUIDL( const QString & uid )
+void ShowRecordElem::setUIDL( const TQString & uid )
{
m_uid = uid;
}
-QString ShowRecordElem::uidl( ) const
+TQString ShowRecordElem::uidl( ) const
{
return m_uid;
}
@@ -267,7 +267,7 @@ int ShowRecordElem::number( ) const
return m_nNumber;
}
-QString ShowRecordElem::content( ) const
+TQString ShowRecordElem::content( ) const
{
return m_content;
}
@@ -300,38 +300,38 @@ bool ShowRecordElem::isSelected( ) const
return false;
}
-QString ShowRecordElem::strSizePrefix( ) const
+TQString ShowRecordElem::strSizePrefix( ) const
{
- QString size;
+ TQString size;
if( m_size >= 1024 * 1024 )
{
//prefix is mega
- size = QString( "%L1M" ).arg( ( (double)m_size / ( 1024 * 1024 ) ), 0, 'f', 1 );
+ size = TQString( "%L1M" ).arg( ( (double)m_size / ( 1024 * 1024 ) ), 0, 'f', 1 );
}
else if( m_size >= 1024 )
{
//prefix is kilo
- size = QString( "%L1K" ).arg( ( (double)m_size / 1024 ), 0, 'f', 1 );
+ size = TQString( "%L1K" ).arg( ( (double)m_size / 1024 ), 0, 'f', 1 );
}
else
//no prefix
- size = QString( "%L1" ).arg( m_size );
+ size = TQString( "%L1" ).arg( m_size );
return size;
}
-QString ShowRecordElem::decodeMailBody( QByteArray body, bool preferHTML ) const
+TQString ShowRecordElem::decodeMailBody( TQByteArray body, bool preferHTML ) const
{
- QString charset; //charset of the content
- QString encoding; //content transfer encoding
+ TQString charset; //charset of the content
+ TQString encoding; //content transfer encoding
- //cast given body to a QCString
- //class QCString needs a null terminated char array to create
+ //cast given body to a TQCString
+ //class TQCString needs a null terminated char array to create
//an object. Therefore we append an null byte to the given mail body
body.resize( body.size() + 1 );
body[ body.size() - 1 ] = '\0';
- QCString strBody( (char *)body.data() );
+ TQCString strBody( (char *)body.data() );
//normalize line ends; remove all \r characters
for( uint i = 0; i < strBody.size(); i++ )
@@ -341,7 +341,7 @@ QString ShowRecordElem::decodeMailBody( QByteArray body, bool preferHTML ) const
//get boundary that is separating the parts of a multipart message
//if the header doesn't contain a boundary attribute, this messsage
//has just one part
- QString boundary = getBoundary();
+ TQString boundary = getBoundary();
//process body subject to it is a multipart messsage or not
if( boundary == "" )
@@ -487,12 +487,12 @@ QString ShowRecordElem::decodeMailBody( QByteArray body, bool preferHTML ) const
strBody = KCodecs::quotedPrintableDecode( strBody );
}
- return QString( strBody );
+ return TQString( strBody );
}
-QString ShowRecordElem::getBoundary( ) const
+TQString ShowRecordElem::getBoundary( ) const
{
- QString boundary;
+ TQString boundary;
//check, whether it is a multipart message
if( m_content.contains( "multipart", false ) )
@@ -519,9 +519,9 @@ QString ShowRecordElem::getBoundary( ) const
return boundary;
}
-QString ShowRecordElem::getCharset( ) const
+TQString ShowRecordElem::getCharset( ) const
{
- QString charset;
+ TQString charset;
//get the position of the first occurance of "charset="
int posCharset = m_header.find( "charset=", 0, false );
@@ -545,12 +545,12 @@ QString ShowRecordElem::getCharset( ) const
charset = charset.left( posSemicolon );
}
- return QString( charset );
+ return TQString( charset );
}
-QString ShowRecordElem::getTransferEncoding( ) const
+TQString ShowRecordElem::getTransferEncoding( ) const
{
- QString encoding;
+ TQString encoding;
//get the position of the first occurance of "charset="
int posEncoding = m_header.find( "Content-Transfer-Encoding:", 0, false );
@@ -572,25 +572,25 @@ QString ShowRecordElem::getTransferEncoding( ) const
encoding.remove( '"' );
}
- return QString( encoding );
+ return TQString( encoding );
}
-int ShowRecordElem::showHeader( QString& account )
+int ShowRecordElem::showHeader( TQString& account )
{
//show header
- QString tsubject = subject();
- QString tmailheader = header();
+ TQString tsubject = subject();
+ TQString tmailheader = header();
//create and open the window
ShowHeaderDialog dlg( kapp->mainWidget(), account, tsubject, tmailheader );
int ret = dlg.exec();
//returns the matching value
- return ret == QDialog::Accepted ? ShowRecordElem::continueShowHeaders : ShowRecordElem::cancelShowHeaders;
+ return ret == TQDialog::Accepted ? ShowRecordElem::continueShowHeaders : ShowRecordElem::cancelShowHeaders;
}
-FilterAction_Type ShowRecordElem::applyHeaderFilter( HeaderFilter* filter, QString account, QString& mailbox, FilterLog* log )
+FilterAction_Type ShowRecordElem::applyHeaderFilter( HeaderFilter* filter, TQString account, TQString& mailbox, FilterLog* log )
{
FilterAction_Type action = filter->check( from(), to(), size(), subject(), header(), account, mailbox );
@@ -609,17 +609,17 @@ FilterAction_Type ShowRecordElem::applyHeaderFilter( HeaderFilter* filter, QStri
return action;
}
-QDateTime ShowRecordElem::sentDateTime() const
+TQDateTime ShowRecordElem::sentDateTime() const
{
return m_unixDate;
}
-void ShowRecordElem::writeToMoveLog( FilterLog * log, QString account, QString mailbox )
+void ShowRecordElem::writeToMoveLog( FilterLog * log, TQString account, TQString mailbox )
{
log->addMovedMail( sentDateTime(), from(), account, subject(), mailbox );
}
-void ShowRecordElem::writeToDeleteLog( FilterLog * log, QString account )
+void ShowRecordElem::writeToDeleteLog( FilterLog * log, TQString account )
{
log->addDeletedMail( sentDateTime(), from(), account, subject() );
}
diff --git a/kshowmail/showrecordelem.h b/kshowmail/showrecordelem.h
index 3d5e9f6..e14ef3f 100644
--- a/kshowmail/showrecordelem.h
+++ b/kshowmail/showrecordelem.h
@@ -18,15 +18,15 @@
#ifndef SHOWRECORDELEM_H
#define SHOWRECORDELEM_H
-//Qt headers
-#include <qdom.h>
-#include <qstring.h>
-#include <qlistview.h>
-#include <qdatetime.h>
+//TQt headers
+#include <ntqdom.h>
+#include <ntqstring.h>
+#include <ntqlistview.h>
+#include <ntqdatetime.h>
//KDE headers
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <mimelib/datetime.h>
#include <kmdcodec.h>
@@ -86,44 +86,44 @@ class ShowRecordElem
* @param uid Unique ID of the mail
* @param isNew TRUE - mail is new; FALSE - mail is not new
*/
- ShowRecordElem( int number, QString& uid, bool isNew );
+ ShowRecordElem( int number, TQString& uid, bool isNew );
/**
* Sets the mail header and extracts From, To, Subject, Date and Content Type.
* All parts of the header are coded according RFC 2047.
* @param header the mail header
*/
- void setHeader( const QString& header );
+ void setHeader( const TQString& header );
/**
* Returns the whole header.
* @return the mail header
*/
- QString header() const;
+ TQString header() const;
/**
* Returns the sender address.
* @return sender address
*/
- QString from() const;
+ TQString from() const;
/**
* Returns the addressee.
* @return the addressee
*/
- QString to() const;
+ TQString to() const;
/**
* Returns the subject.
* @return mail subject
*/
- QString subject() const;
+ TQString subject() const;
/**
* Returns the stored content type.
* @return content type
*/
- QString content() const;
+ TQString content() const;
/**
@@ -131,7 +131,7 @@ class ShowRecordElem
* locale's conventions.
* @return the date
*/
- QString date() const;
+ TQString date() const;
/**
* Returns the date on which the mail was sent.
@@ -139,25 +139,25 @@ class ShowRecordElem
* representations of dates and times, which is YYYY-MM-DDTHH:MM:SS
* @return the date
*/
- QString strUnixTime () const;
+ TQString strUnixTime () const;
/**
* Returns the date and time on which the mail was sent.
* @return the date
*/
- QDateTime sentDateTime() const;
+ TQDateTime sentDateTime() const;
/**
* Sets the unique mail ID.
* @param uid the ID
*/
- void setUIDL( const QString& uid );
+ void setUIDL( const TQString& uid );
/**
* Returns the unique ID of this mail.
* @return UID
*/
- QString uidl() const;
+ TQString uidl() const;
/**
* Sets the size of the mail.
@@ -175,12 +175,12 @@ class ShowRecordElem
* Returns the mail size as string.
* The String has a length of 8 and the number is right-aligned to allow sorting.
*/
- QString strSize () const;
+ TQString strSize () const;
/**
* Returns the mails size as string with prefix
*/
- QString strSizePrefix() const;
+ TQString strSizePrefix() const;
/**
* Sets whether the mail is new or not.
@@ -200,7 +200,7 @@ class ShowRecordElem
* @return localized String "new", if the mail is new
* @return localized String "old", if the mail is not new
*/
- QString state() const;
+ TQString state() const;
/**
* Sets the number of this mail.
@@ -236,14 +236,14 @@ class ShowRecordElem
* at the next view refresh.
* @param filter pointer to the header filter
* @param account name of the account
- * @param mailbox reference to a QString object in which the mailbox name shall be written if the action is MOVE
+ * @param mailbox reference to a TQString object in which the mailbox name shall be written if the action is MOVE
* @param log pointer to the filter log
* @return recommend action
* @see FilterAction_Type
* @see HeaderFilter
* @see markAtViewRefresh
*/
- FilterAction_Type applyHeaderFilter( HeaderFilter* filter, QString account, QString& mailbox, FilterLog* log = NULL );
+ FilterAction_Type applyHeaderFilter( HeaderFilter* filter, TQString account, TQString& mailbox, FilterLog* log = NULL );
/**
* Read a mail (header, size, uid and number) from the given DOM element
@@ -252,7 +252,7 @@ class ShowRecordElem
* a child node called "header".
* @param elem a DOM element which contains a mail
*/
- void readOptions( QDomElement& elem );
+ void readOptions( TQDomElement& elem );
/**
* Creates a new DOM element in the given DOM document and add it to given
@@ -260,7 +260,7 @@ class ShowRecordElem
* @param doc the DOM document in that all options are stored
* @param parent the parent element (account) of the mail
*/
- void saveOptions( QDomDocument& doc, QDomElement& parent );
+ void saveOptions( TQDomDocument& doc, TQDomElement& parent );
/**
* Returns whether the mail is selected in the list view.
@@ -280,7 +280,7 @@ class ShowRecordElem
* @param preferHTML decode HTML part if present
* @return decoded mail body
*/
- QString decodeMailBody( QByteArray body, bool preferHTML ) const;
+ TQString decodeMailBody( TQByteArray body, bool preferHTML ) const;
/**
* Shows the header in a dialog box.
@@ -288,7 +288,7 @@ class ShowRecordElem
* @return continueShowHeaders - the user has OK clicked. The invoking function will show the next header
* @return cancelShowHeaders - the user has Cancel clicked. The invoking function will not show the next header.
*/
- int showHeader( QString& account );
+ int showHeader( TQString& account );
/**
* Writes this mail into the Move Log.
@@ -296,14 +296,14 @@ class ShowRecordElem
* @param account name of the account
* @param mailbox name of the mailbox
*/
- void writeToMoveLog( FilterLog* log, QString account, QString mailbox );
+ void writeToMoveLog( FilterLog* log, TQString account, TQString mailbox );
/**
* Writes this mail into the Delete Log.
* @param log pointer to the log
* @param account name of the account
*/
- void writeToDeleteLog( FilterLog* log, QString account );
+ void writeToDeleteLog( FilterLog* log, TQString account );
/**
* The mail will be marked at the next view refresh.
@@ -315,37 +315,37 @@ class ShowRecordElem
/**
* Mail header; coded according RFC 2047
*/
- QCString m_header;
+ TQCString m_header;
/**
* The sender address; coded according RFC 2047
*/
- QCString m_from;
+ TQCString m_from;
/**
* The addressee; coded according RFC 2047
*/
- QCString m_to;
+ TQCString m_to;
/**
* The subject; coded according RFC 2047
*/
- QCString m_subject;
+ TQCString m_subject;
/**
* The date on which the mail was sent
*/
- QDateTime m_unixDate;
+ TQDateTime m_unixDate;
/**
* The content type
*/
- QCString m_content;
+ TQCString m_content;
/**
* The unique ID of the mail.
*/
- QString m_uid;
+ TQString m_uid;
/**
* Size of the mail
@@ -388,51 +388,51 @@ class ShowRecordElem
* @param item the search item
* @return the content of the found line
*/
- QCString scanHeader( const QString& item ) const;
+ TQCString scanHeader( const TQString& item ) const;
/**
* Sets the given string as sender address
* @param from sender address
*/
- void setFrom( const QCString& from );
+ void setFrom( const TQCString& from );
/**
* Sets the given string as recipient address
* @param to recipient address
*/
- void setTo( const QCString& to );
+ void setTo( const TQCString& to );
/**
* Sets the given string as subject
* @param subject the mail subject
*/
- void setSubject( const QCString& subject );
+ void setSubject( const TQCString& subject );
/**
* Converts the given string to a date-time value and stores it.
* @param date the date
*/
- void setDate( const QCString& date );
+ void setDate( const TQCString& date );
/**
* Sets the given string as content type.
* @param content the content type
*/
- void setContent( const QCString& content );
+ void setContent( const TQCString& content );
/**
* Returns the boundary, if the mail has a multi part body.
* Otherwise it returns an empty string.
* @return boundary
*/
- QString getBoundary() const;
+ TQString getBoundary() const;
/**
* Returns the char set of the content (e.g. iso-8859-1).
* If no char set is denoted, it will returns an empty string.
* @return charset
*/
- QString getCharset() const;
+ TQString getCharset() const;
/**
* Returns the content transfer encoding of the content
@@ -440,7 +440,7 @@ class ShowRecordElem
* If no encoding is denoted, it will returns an empty string.
* @return content transfer encoding
*/
- QString getTransferEncoding() const;
+ TQString getTransferEncoding() const;
};
diff --git a/kshowmail/kwalletaccess.cpp b/kshowmail/tdewalletaccess.cpp
index 20dccc6..1f48e1c 100644
--- a/kshowmail/kwalletaccess.cpp
+++ b/kshowmail/tdewalletaccess.cpp
@@ -1,15 +1,15 @@
//
-// C++ Implementation: kwalletaccess
+// C++ Implementation: tdewalletaccess
//
// Author: Ulrich Weigelt <ulrich.weigelt@gmx.de>, (C) 2007
//
// Copyright: See COPYING file that comes with this distribution
//
//
-#include "kwalletaccess.h"
+#include "tdewalletaccess.h"
-bool KWalletAccess::savePassword( const QString & account, const QString & password )
+bool KWalletAccess::savePassword( const TQString & account, const TQString & password )
{
//check for enabled KWallet
if( !KWallet::Wallet::isEnabled() )
@@ -19,8 +19,8 @@ bool KWalletAccess::savePassword( const QString & account, const QString & passw
}
//get wallet name for network data
- QString name = KWallet::Wallet::NetworkWallet();
- if( name == "" || name == QString::null )
+ TQString name = KWallet::Wallet::NetworkWallet();
+ if( name == "" || name == TQString::null )
{
KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
return false;
@@ -78,21 +78,21 @@ bool KWalletAccess::savePassword( const QString & account, const QString & passw
return true;
}
-QString KWalletAccess::getPassword( const QString & account )
+TQString KWalletAccess::getPassword( const TQString & account )
{
//check for enabled KWallet
if( !KWallet::Wallet::isEnabled() )
{
KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
- return QString::null;
+ return TQString::null;
}
//get wallet name for network data
- QString name = KWallet::Wallet::NetworkWallet();
- if( name == "" || name == QString::null )
+ TQString name = KWallet::Wallet::NetworkWallet();
+ if( name == "" || name == TQString::null )
{
KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//open wallet
@@ -112,7 +112,7 @@ QString KWalletAccess::getPassword( const QString & account )
if( wallet == NULL )
{
KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//set folder
@@ -120,17 +120,17 @@ QString KWalletAccess::getPassword( const QString & account )
if( !setFolderSuccess )
{
KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
- return QString::null;
+ return TQString::null;
}
//read password
- QString password;
+ TQString password;
int readPasswordSuccess = wallet->readPassword( account, password );
if( readPasswordSuccess != 0 )
{
KMessageBox::error( NULL, i18n( "Could not get password of account %1 from KWallet." ).arg( account) );
- return QString::null;
+ return TQString::null;
}
return password;
diff --git a/kshowmail/kwalletaccess.h b/kshowmail/tdewalletaccess.h
index 8e9c537..905abd9 100644
--- a/kshowmail/kwalletaccess.h
+++ b/kshowmail/tdewalletaccess.h
@@ -1,5 +1,5 @@
//
-// C++ Interface: kwalletaccess
+// C++ Interface: tdewalletaccess
//
// Author: Ulrich Weigelt <ulrich.weigelt@gmx.de>, (C) 2007
//
@@ -9,14 +9,14 @@
#ifndef KWALLETACCESS_H
#define KWALLETACCESS_H
-//Qt headers
-#include <qstring.h>
+//TQt headers
+#include <ntqstring.h>
//KDE headers
-#include <kwallet.h>
-#include <kmessagebox.h>
+#include <tdewallet.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
/**
* @brief Provides routines to save and read passwords using KWallet.
@@ -32,14 +32,14 @@ namespace KWalletAccess
* @return TRUE - password successfully saved
* @return FALSE - password could not be saved
*/
- bool savePassword( const QString& account, const QString& password );
+ bool savePassword( const TQString& account, const TQString& password );
/**
* Returns the password of the given account.
* @param account account name
- * @return the password or QString::null, if the sought password is not stored in KWallet.
+ * @return the password or TQString::null, if the sought password is not stored in KWallet.
*/
- QString getPassword( const QString& account );
+ TQString getPassword( const TQString& account );
}
#endif
diff --git a/kshowmail/types.h b/kshowmail/types.h
index defe2c2..a817ee8 100644
--- a/kshowmail/types.h
+++ b/kshowmail/types.h
@@ -14,10 +14,10 @@
#ifndef TYPES_H
#define TYPES_H
-//Qt headers
-#include <qvaluelist.h>
-#include <qmap.h>
-#include <qstring.h>
+//TQt headers
+#include <ntqvaluelist.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
using namespace std;
@@ -59,16 +59,16 @@ namespace Types
};
/**
- * List of mail numbers. It is a QValueList of integers.
+ * List of mail numbers. It is a TQValueList of integers.
*/
- typedef QValueList<int> MailNumberList_Type;
+ typedef TQValueList<int> MailNumberList_Type;
/**
* Map to notice which accounts need to get an order to do a task.
* The Key is the account name and the data a boolean.
* TRUE means the task was ordered, FALSE the task was ended.
*/
- typedef QMap<QString, bool> AccountTaskMap_Type;
+ typedef TQMap<TQString, bool> AccountTaskMap_Type;
/**
* Actions returned by filters.
@@ -91,14 +91,14 @@ namespace Types
struct DownloadActionParams_Type
{
FilterAction_Type action; /**<the filter action*/
- QString mailbox; /**<name of the mailbox if action is MOVE*/
+ TQString mailbox; /**<name of the mailbox if action is MOVE*/
};
/**
* This map is used by ConfigElem and ShowRecord to hold a list of mail numbers which shall be downloaded for
* some filter actions; at time for moving and spam check
*/
- typedef QMap<int, DownloadActionParams_Type> MailToDownloadMap_Type;
+ typedef TQMap<int, DownloadActionParams_Type> MailToDownloadMap_Type;
/**
* Contains all values of a filter criteria.
@@ -108,7 +108,7 @@ namespace Types
int source; /**<Object of comparison; see constants.h for valid values. (CONFIG_VALUE_FILTER_CRITERIA_SOURCE...)*/
int condition; /**<Condition of the comparison. see constants.h for valid values. (CONFIG_VALUE_FILTER_CRITERIA_COND...)*/
uint numValue; /**<Value of a numeric criteria, e.g. Size*/
- QString txtValue; /**<Value of a text criteria, e.g. Subject*/
+ TQString txtValue; /**<Value of a text criteria, e.g. Subject*/
bool cs; /**<TRUE - Comparison is case sensitive. Just used for numeric criteria.*/
};
diff --git a/kshowmail/uniqueapp.cpp b/kshowmail/uniqueapp.cpp
index 822c877..ac38423 100644
--- a/kshowmail/uniqueapp.cpp
+++ b/kshowmail/uniqueapp.cpp
@@ -58,8 +58,8 @@ int UniqueApp::newInstance ()
//---------------------------------
//die in main() eingelesenen Kommandozeile-Argumente in ein
- //KCmdLineArgs-Objekt ablegen
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ //TDECmdLineArgs-Objekt ablegen
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
//wenn als Kommandozeilen-Argument "config" übergeben wurde,
//starte jetzt den Konfigurationsdialog
diff --git a/kshowmail/uniqueapp.h b/kshowmail/uniqueapp.h
index 4c19dab..331119e 100644
--- a/kshowmail/uniqueapp.h
+++ b/kshowmail/uniqueapp.h
@@ -19,8 +19,8 @@
#define UNIQUEAPP_H
//KDE-Header
-#include <kwin.h>
-#include <kcmdlineargs.h>
+#include <twin.h>
+#include <tdecmdlineargs.h>
#include <kuniqueapplication.h>
//KShowMail-Header