summaryrefslogtreecommitdiffstats
path: root/kaddressbook
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp2
-rw-r--r--kaddressbook/filtereditdialog.cpp2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--kaddressbook/kabtools.cpp2
-rw-r--r--kaddressbook/keywidget.cpp2
-rw-r--r--kaddressbook/ldapsearchdialog.cpp2
-rw-r--r--kaddressbook/main.cpp2
-rw-r--r--kaddressbook/nameeditdialog.cpp2
-rw-r--r--kaddressbook/printing/detailledstyle.cpp4
-rw-r--r--kaddressbook/printing/mikesstyle.cpp2
-rw-r--r--kaddressbook/printing/printingwizard.cpp4
-rw-r--r--kaddressbook/printing/printprogress.cpp4
-rw-r--r--kaddressbook/undocmds.cpp4
-rw-r--r--kaddressbook/viewconfigurewidget.cpp2
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp2
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp8
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp2
-rw-r--r--kaddressbook/xxportmanager.cpp2
-rw-r--r--kaddressbook/xxportselectdialog.cpp4
20 files changed, 30 insertions, 30 deletions
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 0f6bcdb86..63ed10ac1 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -58,7 +58,7 @@ void LocationMap::showAddress( const TDEABC::Address &addr )
if ( url.isEmpty() )
return;
- kapp->invokeBrowser( url.url() );
+ tdeApp->invokeBrowser( url.url() );
}
TQString LocationMap::createUrl( const TDEABC::Address &addr )
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index beedc3b6e..100c62681 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -53,7 +53,7 @@ ContactEditorWidgetManager::~ContactEditorWidgetManager()
ContactEditorWidgetManager *ContactEditorWidgetManager::self()
{
- kdWarning( !kapp, 7520 ) << "No TQApplication object available!" << endl;
+ kdWarning( !tdeApp, 7520 ) << "No TQApplication object available!" << endl;
if ( !mSelf )
mSelf = new ContactEditorWidgetManager();
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 684fe1e69..5873ae181 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -158,7 +158,7 @@ void FilterEditDialog::filterNameTextChanged( const TQString &text )
void FilterEditDialog::slotHelp()
{
- kapp->invokeHelp( "using-filters" );
+ tdeApp->invokeHelp( "using-filters" );
}
FilterDialog::FilterDialog( TQWidget *parent, const char *name )
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 85b08976b..ace5600d0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -192,7 +192,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
TDEAcceleratorManager::manage( mWidget );
- mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+ mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
}
KABCore::~KABCore()
@@ -453,7 +453,7 @@ void KABCore::sendMail()
void KABCore::sendMail( const TQString& email )
{
- kapp->invokeMailer( email, "" );
+ tdeApp->invokeMailer( email, "" );
}
void KABCore::mailVCard()
@@ -477,7 +477,7 @@ void KABCore::startChat()
void KABCore::browse( const TQString& url )
{
- kapp->invokeBrowser( url );
+ tdeApp->invokeBrowser( url );
}
void KABCore::selectAllContacts()
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index ddebac13e..6fd38387e 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -97,7 +97,7 @@ void KABTools::mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab )
}
}
- kapp->invokeMailer( TQString(), TQString(), TQString(),
+ tdeApp->invokeMailer( TQString(), TQString(), TQString(),
TQString(),
TQString(),
TQString(),
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 890bf6446..f2682261f 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -175,7 +175,7 @@ void KeyWidget::exportKey()
(*s) << key.textData();
tempFile.close();
- TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
+ TDEIO::NetAccess::upload( tempFile.name(), url, tdeApp->mainWidget() );
}
void KeyWidget::updateKeyCombo()
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 07668b710..8b5b62e09 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -468,7 +468,7 @@ TQString LDAPSearchDialog::selectedEMails() const
void LDAPSearchDialog::slotHelp()
{
- kapp->invokeHelp( "ldap-queries" );
+ tdeApp->invokeHelp( "ldap-queries" );
}
void LDAPSearchDialog::slotUnselectAll()
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index d4f6c7767..22af385de 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -101,7 +101,7 @@ int KAddressBookApp::newInstance()
static bool firstInstance = true;
if ( !firstInstance )
- TDEStartupInfo::setNewStartupId( mMainWin, kapp->startupId() );
+ TDEStartupInfo::setNewStartupId( mMainWin, tdeApp->startupId() );
firstInstance = false;
#endif
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 6d90324ac..122de2508 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -315,7 +315,7 @@ void NameEditDialog::initTypeCombo()
void NameEditDialog::slotHelp()
{
- kapp->invokeHelp( "managing-contacts-automatic-nameparsing" );
+ tdeApp->invokeHelp( "managing-contacts-automatic-nameparsing" );
}
#include "nameeditdialog.moc"
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 55ac89ca9..73dc515e9 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -79,7 +79,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
addPage( mPageAppearance, i18n( "Detailed Print Style - Appearance" ) );
- config = kapp->config();
+ config = tdeApp->config();
config->setGroup( ConfigSectionName );
kdeFonts = config->readBoolEntry( UseKDEFonts, true );
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintP
TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
// store the configuration settings:
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup( ConfigSectionName );
useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 25b2e02e9..e9ac5979f 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -78,7 +78,7 @@ void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *
for ( it = contacts.begin(); it != contacts.end(); ++it ) {
progress->setProgress( (count++ * 100) / contacts.count() );
- kapp->processEvents();
+ tdeApp->processEvents();
// Get the total height so we know if it will fit on the current page
height = calcHeight( *it, mFont, mBoldFont );
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index a9375e3cb..85bbb6d0b 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -62,7 +62,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
mSelectionPage->setUseSelection( !selection.isEmpty() );
insertPage( mSelectionPage, i18n("Choose Contacts to Print"), -1 );
- mFilters = Filter::restore( kapp->config(), "Filter" );
+ mFilters = Filter::restore( tdeApp->config(), "Filter" );
TQStringList filters;
for ( Filter::List::ConstIterator it = mFilters.begin(); it != mFilters.end(); ++it )
filters.append( (*it).name() );
@@ -153,7 +153,7 @@ void PrintingWizard::print()
PrintProgress *progress = new PrintProgress( this );
insertPage( progress, i18n( "Print Progress" ), -1 );
showPage( progress );
- kapp->processEvents();
+ tdeApp->processEvents();
// prepare list of contacts to print:
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 459cfbee1..edc9b479b 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -71,13 +71,13 @@ void PrintProgress::addMessage( const TQString &msg )
body.append( TQString( "<li>" ) + (*it) + TQString( "</li>" ) );
mLogBrowser->setText( head + body + foot );
- kapp->processEvents();
+ tdeApp->processEvents();
}
void PrintProgress::setProgress( int step )
{
mProgressBar->setProgress( step );
- kapp->processEvents();
+ tdeApp->processEvents();
}
#include "printprogress.moc"
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index aff63dd31..f8163df89 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -262,7 +262,7 @@ void CutCommand::unexecute()
mAddresseeList.clear();
TQClipboard *cb = TQApplication::clipboard();
- kapp->processEvents();
+ tdeApp->processEvents();
cb->setText( mOldText );
}
@@ -291,7 +291,7 @@ void CutCommand::execute()
TQClipboard *cb = TQApplication::clipboard();
mOldText = cb->text();
- kapp->processEvents();
+ tdeApp->processEvents();
#if defined(KABC_VCARD_ENCODING_FIX)
cb->setText( TQString::fromUtf8( mClipText.data() ) );
#else
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index cc60ce539..c1b3b85b3 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -110,7 +110,7 @@ void ViewConfigureDialog::saveSettings( TDEConfig *config )
void ViewConfigureDialog::slotHelp()
{
- kapp->invokeHelp( "using-views" );
+ tdeApp->invokeHelp( "using-views" );
}
#include "viewconfigurewidget.moc"
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 6b6333035..a7d0d38b0 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -186,7 +186,7 @@ void KAddressBookTableView::readConfig( TDEConfig *config )
if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) {
if ( !mIMProxy ) {
- mIMProxy = KIMProxy::instance( kapp->dcopClient() );
+ mIMProxy = KIMProxy::instance( tdeApp->dcopClient() );
connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
this, TQ_SLOT( updatePresence( const TQString& ) ) );
}
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 589bfb243..b77de93f7 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -166,7 +166,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
progressDialog.setLabel( i18n( "Importing contacts" ) );
progressDialog.show();
- kapp->processEvents();
+ tdeApp->processEvents();
for ( int row = 1; row < mTable->numRows(); ++row ) {
TDEABC::Addressee a;
@@ -344,7 +344,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
}
}
- kapp->processEvents();
+ tdeApp->processEvents();
if ( progressDialog.wasCancelled() )
return TDEABC::AddresseeList();
@@ -792,7 +792,7 @@ void CSVImportDialog::applyTemplate()
TQStringList templates;
// load all template files
- TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+ TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) +
"/csv-templates/*.desktop", true, true );
for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
@@ -848,7 +848,7 @@ void CSVImportDialog::applyTemplate()
void CSVImportDialog::saveTemplate()
{
TQString fileName = KFileDialog::getSaveFileName(
- locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+ locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
"*.desktop", this );
if ( fileName.isEmpty() )
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 6c09db006..797c31d7d 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -264,7 +264,7 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
} else {
TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
text = text.arg( (*it).url() );
- text = text.arg( kapp->translate( "TQFile",
+ text = text.arg( tdeApp->translate( "TQFile",
TQString(file.errorString()).latin1() ) );
KMessageBox::error( parentWidget(), text, caption );
anyFailures = true;
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 3424e98ea..12e6ae9f2 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -151,7 +151,7 @@ void XXPortManager::loadPlugins()
connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ),
this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) );
- obj->setTDEApplication( kapp );
+ obj->setTDEApplication( tdeApp );
}
}
}
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 449ea60df..2d7229bfb 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -57,7 +57,7 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
TQ_SLOT( categoryClicked( TQListViewItem* ) ) );
// setup filters
- mFilters = Filter::restore( kapp->config(), "Filter" );
+ mFilters = Filter::restore( tdeApp->config(), "Filter" );
Filter::List::ConstIterator filterIt;
TQStringList filters;
for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt )
@@ -172,7 +172,7 @@ void XXPortSelectDialog::categoryClicked( TQListViewItem *i )
void XXPortSelectDialog::slotHelp()
{
- kapp->invokeHelp( "import-and-export" );
+ tdeApp->invokeHelp( "import-and-export" );
}
void XXPortSelectDialog::initGUI()