summaryrefslogtreecommitdiffstats
path: root/tdeabc
diff options
context:
space:
mode:
Diffstat (limited to 'tdeabc')
-rw-r--r--tdeabc/frontend/main.cpp2
-rw-r--r--tdeabc/frontend/mainWindow.ui4
-rw-r--r--tdeabc/frontend/mainWindow.ui.h12
-rw-r--r--tdeabc/tdeabc2mutt/tdeabc2mutt.cpp6
-rw-r--r--tdeabc/tdeabc2mutt/tdeabc2mutt.h2
-rw-r--r--tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp6
6 files changed, 16 insertions, 16 deletions
diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp
index 0e941e01..706d94e7 100644
--- a/tdeabc/frontend/main.cpp
+++ b/tdeabc/frontend/main.cpp
@@ -15,6 +15,6 @@ int main( int argc, char ** argv )
MainWindow *w = new MainWindow;
w->show();
- app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
return app.exec();
}
diff --git a/tdeabc/frontend/mainWindow.ui b/tdeabc/frontend/mainWindow.ui
index 240114a6..4bce4b34 100644
--- a/tdeabc/frontend/mainWindow.ui
+++ b/tdeabc/frontend/mainWindow.ui
@@ -1365,7 +1365,7 @@
<variable>TQString mCurrentAddress</variable>
<variable>TQString mCurrentPhone</variable>
</variables>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>destroy()</slot>
<slot>fileSave()</slot>
@@ -1404,6 +1404,6 @@
<slot>addressBookLocked()</slot>
<slot>addressBookUnlocked()</slot>
<slot>fileOpenStd()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h
index 8e678b93..5a32e6cc 100644
--- a/tdeabc/frontend/mainWindow.ui.h
+++ b/tdeabc/frontend/mainWindow.ui.h
@@ -39,12 +39,12 @@ void MainWindow::init()
mEmailListView->header()->hide();
mCategoryListView->header()->hide();
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
- TQT_SLOT( addressBookChanged() ) );
- connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ),
- TQT_SLOT( addressBookLocked() ) );
- connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ),
- TQT_SLOT( addressBookUnlocked() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ),
+ TQ_SLOT( addressBookChanged() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookLocked( AddressBook * ) ),
+ TQ_SLOT( addressBookLocked() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookUnlocked( AddressBook * ) ),
+ TQ_SLOT( addressBookUnlocked() ) );
}
void MainWindow::destroy()
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
index d36582ba..f872a13c 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
@@ -42,8 +42,8 @@ void KABC2Mutt::run()
mAddressBook = TDEABC::StdAddressBook::self( true );
TDEABC::StdAddressBook::setAutomaticSave( false );
- connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( loadingFinished() ) );
+ connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( loadingFinished() ) );
}
void KABC2Mutt::loadingFinished()
@@ -148,7 +148,7 @@ void KABC2Mutt::loadingFinished()
}
}
- kapp->quit();
+ tdeApp->quit();
}
static std::ostream & operator<< ( std::ostream &os, const TQString &s )
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.h b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
index a0e58a59..6c9960c7 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.h
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
@@ -24,7 +24,7 @@
class KABC2Mutt : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
index 9228e1f4..059c6425 100644
--- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
+++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
@@ -21,11 +21,11 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeabc/stdaddressbook.h>
#include <libtdepim/distributionlist.h>
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
void convertDistributionLists()
{
- KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
+ TDESimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );
if ( entryMap.isEmpty() ) // nothing to convert