diff --git a/doc/cs/index.docbook b/doc/cs/index.docbook
index b0b14a6..0fa50d7 100644
--- a/doc/cs/index.docbook
+++ b/doc/cs/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -360,7 +360,7 @@ distribution. -->
Credits and License
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
index 2596836..2d11c02 100644
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -368,7 +368,7 @@ distribution. -->
Beiträge
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index b0b14a6..0fa50d7 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -360,7 +360,7 @@ distribution. -->
Credits and License
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
index e2881c4..ee1e5df 100644
--- a/doc/es/index.docbook
+++ b/doc/es/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -294,7 +294,7 @@ distribution. -->
Créditos y licensia
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook
index 4b3c35e..534dd4f 100644
--- a/doc/fr/index.docbook
+++ b/doc/fr/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -230,7 +230,7 @@ distribution. -->
Credits et Licence
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/html/configelem_8cpp-source.html b/doc/html/configelem_8cpp-source.html
index 2121fff..69b11ce 100644
--- a/doc/html/configelem_8cpp-source.html
+++ b/doc/html/configelem_8cpp-source.html
@@ -124,7 +124,7 @@
00107 void ConfigElem::saveOptions( TQDomDocument& doc, TQDomElement& parent )
00108 {
00109
-00110 TDEConfig* config = TDEApplication::kApplication()->config();
+00110 TDEConfig* config = tdeApp->config();
00111
00112
00113 config->setGroup( getAccountName() );
@@ -314,7 +314,7 @@
00297 setPassword( password );
00298
00299
-00300 TDEConfig* config = TDEApplication::kApplication()->config();
+00300 TDEConfig* config = tdeApp->config();
00301 config->setGroup( getAccountName() );
00302
00303 if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
@@ -605,7 +605,7 @@
00588 emit sigMessageWindowOpened();
00589
00590
-00591 ShowMailDialog dlg( kapp->mainWidget(), m_strAccount, appConfig->allowHTML(), tsender, tdate, tsize, tsubject, tmailbody );
+00591 ShowMailDialog dlg( tdeApp->mainWidget(), m_strAccount, appConfig->allowHTML(), tsender, tdate, tsize, tsubject, tmailbody );
00592 int ret = dlg.exec();
00593
00594
diff --git a/doc/html/configlist_8cpp-source.html b/doc/html/configlist_8cpp-source.html
index d8ccfea..f7681a5 100644
--- a/doc/html/configlist_8cpp-source.html
+++ b/doc/html/configlist_8cpp-source.html
@@ -185,7 +185,7 @@
00168 void ConfigList::beep ()
00169 {
00170 if (m_bBeep)
-00171 kapp->beep ();
+00171 tdeApp->beep ();
00172 }
00173
00174 void ConfigList::playSound ()
@@ -768,7 +768,7 @@
00751 void ConfigList::refreshSetup( TDEListView* view )
00752 {
00753
-00754 config = TDEApplication::kApplication()->config();
+00754 config = tdeApp->config();
00755
00756
00757 config->setGroup( CONFIG_GROUP_ACTIONS );
diff --git a/doc/html/kfeedback_8cpp-source.html b/doc/html/kfeedback_8cpp-source.html
index 12bc843..6371891 100644
--- a/doc/html/kfeedback_8cpp-source.html
+++ b/doc/html/kfeedback_8cpp-source.html
@@ -180,7 +180,7 @@
00163 if ( aboutData )
00164 subject = aboutData->programName() + "-" + aboutData->version();
00165 else
-00166 subject = kapp->name();
+00166 subject = tdeApp->name();
00167
00168 subject += " user feedback";
00169
@@ -215,7 +215,7 @@
00198
00199
00200
-00201 kapp->invokeMailer( mail );
+00201 tdeApp->invokeMailer( mail );
00202
00203 emit mailSent();
00204 }
diff --git a/doc/html/kshowmail_8cpp-source.html b/doc/html/kshowmail_8cpp-source.html
index 102d2eb..b35e04a 100644
--- a/doc/html/kshowmail_8cpp-source.html
+++ b/doc/html/kshowmail_8cpp-source.html
@@ -268,7 +268,7 @@
00258
00259 if (m_state != idle)
00260 {
-00261 kapp->beep();
+00261 tdeApp->beep();
00262 return;
00263 }
00264
@@ -330,7 +330,7 @@
00320
00321 if ( m_state != idle )
00322 {
-00323 kapp->beep();
+00323 tdeApp->beep();
00324 initNextRefresh();
00325 return;
00326 }
@@ -357,7 +357,7 @@
00347 {
00348 if (m_state == idle)
00349 {
-00350 kapp->beep ();
+00350 tdeApp->beep ();
00351 return;
00352 }
00353 kdDebug() << "KShowMailApp::slotStop" << endl;
@@ -416,7 +416,7 @@
00406
00407 if( m_state != idle )
00408 {
-00409 kapp->beep();
+00409 tdeApp->beep();
00410 return;
00411 }
00412
@@ -456,7 +456,7 @@
00446
00447 if( m_state != idle )
00448 {
-00449 kapp->beep ();
+00449 tdeApp->beep ();
00450 return;
00451 }
00452
@@ -470,7 +470,7 @@
00460
00461 if( m_state != idle )
00462 {
-00463 kapp->beep ();
+00463 tdeApp->beep ();
00464 return;
00465 }
00466
@@ -529,7 +529,7 @@
00519 {
00520 if (m_state != idle)
00521 {
-00522 kapp->beep ();
+00522 tdeApp->beep ();
00523 return;
00524 }
00525 m_state = configure;
@@ -776,7 +776,7 @@
00766
00767 if (m_state != idle)
00768 {
-00769 kapp->beep();
+00769 tdeApp->beep();
00770 return;
00771 }
00772
diff --git a/doc/html/kshowmailview_8cpp-source.html b/doc/html/kshowmailview_8cpp-source.html
index 9a371db..7a9b5b2 100644
--- a/doc/html/kshowmailview_8cpp-source.html
+++ b/doc/html/kshowmailview_8cpp-source.html
@@ -54,7 +54,7 @@
00037 TQSplitter(Vertical, parent, name)
00038 {
00039
-00040 config = TDEApplication::kApplication()->config();
+00040 config = tdeApp->config();
00041
00042 m_pixOk = new TQPixmap (::locate ("data", "kshowmail/pics/ok.png"));
00043
diff --git a/doc/html/serverdialog_8cpp-source.html b/doc/html/serverdialog_8cpp-source.html
index 08c02ed..cfe9b99 100644
--- a/doc/html/serverdialog_8cpp-source.html
+++ b/doc/html/serverdialog_8cpp-source.html
@@ -179,7 +179,7 @@
00162 }
00163
00164
-00165 TDEConfig* config = TDEApplication::kApplication()->config();
+00165 TDEConfig* config = tdeApp->config();
00166
00167 config->setGroup( txtAccount->text() );
00168
diff --git a/doc/html/showrecordelem_8cpp-source.html b/doc/html/showrecordelem_8cpp-source.html
index 6e4329c..c47bd45 100644
--- a/doc/html/showrecordelem_8cpp-source.html
+++ b/doc/html/showrecordelem_8cpp-source.html
@@ -607,7 +607,7 @@
00590 TQString tmailheader = header();
00591
00592
-00593 ShowHeaderDialog dlg( kapp->mainWidget(), account, tsubject, tmailheader );
+00593 ShowHeaderDialog dlg( tdeApp->mainWidget(), account, tsubject, tmailheader );
00594 int ret = dlg.exec();
00595
00596
diff --git a/doc/hu/index.docbook b/doc/hu/index.docbook
index f259b55..74f5845 100644
--- a/doc/hu/index.docbook
+++ b/doc/hu/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -334,7 +334,7 @@ distribution. -->
Szerzôk és Licnec
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index c1a3798..cfd3805 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -366,7 +366,7 @@ distribution. -->
Riconoscimenti e Licenza
-&kapp;
+&tdeApp;
Copyright del programma 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 1dd253a..c5f5549 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -359,7 +359,7 @@ distribution. -->
Авторы и лицензия
-&kapp;
+&tdeApp;
Program copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index bbca455..ebde308 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -1,7 +1,7 @@
Kshowmail'>
-
+
@@ -236,7 +236,7 @@ distribution. -->
Tack till och licens
-&kapp;
+&tdeApp;
Programmet copyright 2000-2003 Eggert Ehmke eggert.ehmke@berlin.de
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 9ac5f0f..1302b1c 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -119,7 +119,7 @@ ConfigElem::~ConfigElem()
void ConfigElem::saveOptions( TQDomDocument& doc, TQDomElement& parent )
{
//get application config
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
//save the active state
config->setGroup( getAccountName() );
@@ -304,7 +304,7 @@ bool ConfigElem::assertPassword( bool force )
setPassword( password );
//save password in file or TDEWallet
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( getAccountName() );
if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
@@ -633,7 +633,7 @@ void ConfigElem::slotBodyDownloaded( TDEIO::Job * job )
emit sigMessageWindowOpened();
//create and open the window
- ShowMailDialog dlg( kapp->mainWidget(), m_strAccount, appConfig->allowHTML(), tsender, tdate, tsize, tsubject, tmailbody );
+ ShowMailDialog dlg( tdeApp->mainWidget(), m_strAccount, appConfig->allowHTML(), tsender, tdate, tsize, tsubject, tmailbody );
int ret = dlg.exec();
//emit signal to notify the closing of a window
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index 184bb48..ba18607 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -168,7 +168,7 @@ bool ConfigList::setItem (const char* item)
void ConfigList::beep ()
{
if (m_bBeep)
- kapp->beep ();
+ tdeApp->beep ();
}
void ConfigList::playSound ()
@@ -739,7 +739,7 @@ void ConfigList::showSelectedHeaders( )
void ConfigList::refreshSetup( TDEListView* view )
{
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//read actions group
config->setGroup( CONFIG_GROUP_ACTIONS );
diff --git a/kshowmail/filteritem.cpp b/kshowmail/filteritem.cpp
index 70a2954..c443586 100644
--- a/kshowmail/filteritem.cpp
+++ b/kshowmail/filteritem.cpp
@@ -14,7 +14,7 @@
FilterItem::FilterItem( uint filterNr )
{
//get the application config object
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//save number
filterNumber = filterNr;
diff --git a/kshowmail/filteritemcriteria.cpp b/kshowmail/filteritemcriteria.cpp
index 6d8684d..3a29518 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 = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//save numbers
FilterNumber = FilterNr;
diff --git a/kshowmail/filterlog.cpp b/kshowmail/filterlog.cpp
index 38484cb..58f20e4 100644
--- a/kshowmail/filterlog.cpp
+++ b/kshowmail/filterlog.cpp
@@ -14,7 +14,7 @@
FilterLog::FilterLog()
{
//get the application config object
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load the setup
loadSetup();
diff --git a/kshowmail/headerfilter.cpp b/kshowmail/headerfilter.cpp
index 8d0c51d..d0069d7 100644
--- a/kshowmail/headerfilter.cpp
+++ b/kshowmail/headerfilter.cpp
@@ -14,7 +14,7 @@
HeaderFilter::HeaderFilter()
{
//get the application config object
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//the filter list shall delete all filters if it will be deleted itself
filters.setAutoDelete( true );
diff --git a/kshowmail/kcmconfigs/accountsetupitem.cpp b/kshowmail/kcmconfigs/accountsetupitem.cpp
index e073cf0..ef13945 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.cpp
+++ b/kshowmail/kcmconfigs/accountsetupitem.cpp
@@ -48,7 +48,7 @@ void AccountSetupItem::init( )
_transferSecurity = DEFAULT_ACCOUNT_SECTRANSFER;
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
}
void AccountSetupItem::setAccountName( const TQString & name )
diff --git a/kshowmail/kcmconfigs/configaccounts.cpp b/kshowmail/kcmconfigs/configaccounts.cpp
index 47f7f11..f48e36d 100644
--- a/kshowmail/kcmconfigs/configaccounts.cpp
+++ b/kshowmail/kcmconfigs/configaccounts.cpp
@@ -60,7 +60,7 @@ ConfigAccounts::ConfigAccounts( TQWidget * parent, const char * name, const TQSt
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configured values
load();
diff --git a/kshowmail/kcmconfigs/configactions.cpp b/kshowmail/kcmconfigs/configactions.cpp
index 4b41314..44fe58c 100644
--- a/kshowmail/kcmconfigs/configactions.cpp
+++ b/kshowmail/kcmconfigs/configactions.cpp
@@ -113,7 +113,7 @@ ConfigActions::ConfigActions( TQWidget * parent, const char * name, const TQStri
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configured values
load();
diff --git a/kshowmail/kcmconfigs/configdisplay.cpp b/kshowmail/kcmconfigs/configdisplay.cpp
index abcd1d6..2faaad8 100644
--- a/kshowmail/kcmconfigs/configdisplay.cpp
+++ b/kshowmail/kcmconfigs/configdisplay.cpp
@@ -127,7 +127,7 @@ ConfigDisplay::ConfigDisplay( TQWidget * parent, const char * name, const TQStri
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configurated values
load();
diff --git a/kshowmail/kcmconfigs/configfilter.cpp b/kshowmail/kcmconfigs/configfilter.cpp
index 1384d0d..1f32990 100644
--- a/kshowmail/kcmconfigs/configfilter.cpp
+++ b/kshowmail/kcmconfigs/configfilter.cpp
@@ -160,7 +160,7 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
slotFilterActiveToggled( DEFAULT_FILTER_ACTIVE );
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->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.
diff --git a/kshowmail/kcmconfigs/configgeneral.cpp b/kshowmail/kcmconfigs/configgeneral.cpp
index b96d0a0..a5c1d38 100644
--- a/kshowmail/kcmconfigs/configgeneral.cpp
+++ b/kshowmail/kcmconfigs/configgeneral.cpp
@@ -111,7 +111,7 @@ ConfigGeneral::ConfigGeneral( TQWidget * parent, const char * name, const TQStri
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configurated values
load();
diff --git a/kshowmail/kcmconfigs/configlog.cpp b/kshowmail/kcmconfigs/configlog.cpp
index 54bf579..65ffec2 100644
--- a/kshowmail/kcmconfigs/configlog.cpp
+++ b/kshowmail/kcmconfigs/configlog.cpp
@@ -97,7 +97,7 @@ ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList &
spbMovDays->setHidden( true );
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configured values
load();
diff --git a/kshowmail/kcmconfigs/configspamcheck.cpp b/kshowmail/kcmconfigs/configspamcheck.cpp
index 7d23719..61df959 100644
--- a/kshowmail/kcmconfigs/configspamcheck.cpp
+++ b/kshowmail/kcmconfigs/configspamcheck.cpp
@@ -86,7 +86,7 @@ ConfigSpamcheck::ConfigSpamcheck(TQWidget * parent, const char * name, const TQS
gboxAction->setEnabled( isSpamAssassinRunning() );
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load configured values
load();
diff --git a/kshowmail/kcmconfigs/filtersetupitem.cpp b/kshowmail/kcmconfigs/filtersetupitem.cpp
index d964296..30f17c7 100644
--- a/kshowmail/kcmconfigs/filtersetupitem.cpp
+++ b/kshowmail/kcmconfigs/filtersetupitem.cpp
@@ -36,7 +36,7 @@ FilterSetupItem::~FilterSetupItem()
void FilterSetupItem::init( )
{
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//set default values
setName( i18n( DEFAULT_FILTER_NAME ) );
diff --git a/kshowmail/kcmconfigs/senderlistdialog.cpp b/kshowmail/kcmconfigs/senderlistdialog.cpp
index 1e21f40..c23fb70 100644
--- a/kshowmail/kcmconfigs/senderlistdialog.cpp
+++ b/kshowmail/kcmconfigs/senderlistdialog.cpp
@@ -18,7 +18,7 @@ SenderListDialog::SenderListDialog(TQWidget *parent, ListType list, const char *
this->list = list;
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//set caption
if( list == White )
diff --git a/kshowmail/kfeedback.cpp b/kshowmail/kfeedback.cpp
index 2041413..0807980 100644
--- a/kshowmail/kfeedback.cpp
+++ b/kshowmail/kfeedback.cpp
@@ -163,7 +163,7 @@ KFeedbackForm::sendMail()
if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version();
else
- subject = kapp->name();
+ subject = tdeApp->name();
subject += " user feedback";
@@ -198,7 +198,7 @@ KFeedbackForm::sendMail()
// Actually send mail
//
- kapp->invokeMailer( mail );
+ tdeApp->invokeMailer( mail );
emit mailSent();
}
diff --git a/kshowmail/kshowmail.cpp b/kshowmail/kshowmail.cpp
index ce59f69..c197c0a 100644
--- a/kshowmail/kshowmail.cpp
+++ b/kshowmail/kshowmail.cpp
@@ -249,7 +249,7 @@ void KShowMailApp::slotSetupAccount()
//just open the dialog, if the app is idle
if (m_state != idle)
{
- kapp->beep();
+ tdeApp->beep();
return;
}
@@ -311,7 +311,7 @@ void KShowMailApp::slotRefresh()
//return, if the app is not idle
if ( m_state != idle )
{
- kapp->beep();
+ tdeApp->beep();
initNextRefresh();
return;
}
@@ -338,7 +338,7 @@ void KShowMailApp::slotStop ()
{
if (m_state == idle)
{
- kapp->beep ();
+ tdeApp->beep ();
return;
}
kdDebug() << "KShowMailApp::slotStop" << endl;
@@ -400,7 +400,7 @@ void KShowMailApp::slotDelete()
//just delete, if no operation is running
if( m_state != idle )
{
- kapp->beep();
+ tdeApp->beep();
return;
}
@@ -440,7 +440,7 @@ void KShowMailApp::slotShowHeader ()
//only show headers, if the app is idle
if( m_state != idle )
{
- kapp->beep ();
+ tdeApp->beep ();
return;
}
@@ -454,7 +454,7 @@ void KShowMailApp::slotShowMessage ()
//return, if application is not idle
if( m_state != idle )
{
- kapp->beep ();
+ tdeApp->beep ();
return;
}
@@ -737,7 +737,7 @@ void KShowMailApp::slotSetup( )
//just open the dialog, if the app is idle
if (m_state != idle)
{
- kapp->beep();
+ tdeApp->beep();
return;
}
@@ -811,7 +811,7 @@ void KShowMailApp::slotAddToWhitelist( )
TQStringList newEntries = m_ConfigList.getSelectedSenders();
//get previous whitelist from config
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( CONFIG_GROUP_FILTER );
TQStringList whiteList = config->readListEntry( CONFIG_ENTRY_FILTER_WHITELIST );
@@ -838,7 +838,7 @@ void KShowMailApp::slotAddToBlacklist( )
TQStringList newEntries = m_ConfigList.getSelectedSenders();
//get previous blacklist from config
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( CONFIG_GROUP_FILTER );
TQStringList blackList = config->readListEntry( CONFIG_ENTRY_FILTER_BLACKLIST );
diff --git a/kshowmail/kshowmailview.cpp b/kshowmail/kshowmailview.cpp
index aba1934..f517359 100644
--- a/kshowmail/kshowmailview.cpp
+++ b/kshowmail/kshowmailview.cpp
@@ -40,7 +40,7 @@ KshowmailView::KshowmailView(TQWidget *parent, const char *name):
setFocusPolicy( TQWidget::StrongFocus );
//get application config object (kshowmailrc)
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load active pic for the account list
m_pixOk = new TQPixmap( ::locate( "data", "kshowmail/pics/ok.png" ) );
@@ -157,7 +157,7 @@ void KshowmailView::slotAccountClicked( TQListViewItem* pItem, const TQPoint&, i
{
//get application config object (kshowmailrc)
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
if( col == 0 )
{
diff --git a/kshowmail/senderlistfilter.cpp b/kshowmail/senderlistfilter.cpp
index 881a376..8449b5e 100644
--- a/kshowmail/senderlistfilter.cpp
+++ b/kshowmail/senderlistfilter.cpp
@@ -15,7 +15,7 @@ SenderListFilter::SenderListFilter()
{
//get the application config object
- config = TDEApplication::kApplication()->config();
+ config = tdeApp->config();
//load the setup
load();
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 7adecd6..4dec202 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -202,7 +202,7 @@ void ServerDialog::slotOk( )
}
//get application config object (kshowmailrc)
- TDEConfig* config = TDEApplication::kApplication()->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( txtAccount->text() );
diff --git a/kshowmail/showmaildialog.cpp b/kshowmail/showmaildialog.cpp
index 1b57c7c..f081363 100644
--- a/kshowmail/showmaildialog.cpp
+++ b/kshowmail/showmaildialog.cpp
@@ -94,7 +94,7 @@ void ShowMailDialog::slotUser1( )
mail.setQuery( "?subject=" + KURL::encode_string( "Re: " + m_subject ) + "&body=" + KURL::encode_string( body ) );
//invoke mailer
- kapp->invokeMailer( mail );
+ tdeApp->invokeMailer( mail );
}
diff --git a/kshowmail/showrecordelem.cpp b/kshowmail/showrecordelem.cpp
index 19af8ae..3b12e68 100644
--- a/kshowmail/showrecordelem.cpp
+++ b/kshowmail/showrecordelem.cpp
@@ -583,7 +583,7 @@ int ShowRecordElem::showHeader( TQString& account )
TQString tmailheader = header();
//create and open the window
- ShowHeaderDialog dlg( kapp->mainWidget(), account, tsubject, tmailheader );
+ ShowHeaderDialog dlg( tdeApp->mainWidget(), account, tsubject, tmailheader );
int ret = dlg.exec();
//returns the matching value