summaryrefslogtreecommitdiffstats
path: root/kbabel/common
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/common')
-rw-r--r--kbabel/common/catalog.cpp92
-rw-r--r--kbabel/common/catalog.h8
-rw-r--r--kbabel/common/catalogfileplugin.h6
-rw-r--r--kbabel/common/catalogitem.h2
-rw-r--r--kbabel/common/catalogsettings.cpp2
-rw-r--r--kbabel/common/catalogsettings.h18
-rw-r--r--kbabel/common/editcmd.h12
-rw-r--r--kbabel/common/kbmailer.cpp10
-rw-r--r--kbabel/common/kbmailer.h4
-rw-r--r--kbabel/common/kbproject.h2
-rw-r--r--kbabel/common/kbprojectmanager.cpp2
-rw-r--r--kbabel/common/kbprojectmanager.h4
-rw-r--r--kbabel/common/msgfmt.cpp20
-rw-r--r--kbabel/common/msgfmt.h4
-rw-r--r--kbabel/common/poinfo.cpp6
-rw-r--r--kbabel/common/poinfo.h2
-rw-r--r--kbabel/common/projectsettings.cpp2
-rw-r--r--kbabel/common/projectsettings.h4
-rw-r--r--kbabel/common/regexpextractor.h6
-rw-r--r--kbabel/common/tagextractor.h2
20 files changed, 104 insertions, 104 deletions
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index fcf50750..76ab194a 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -930,15 +930,15 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0));
// provide progress bar indication
- connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
- this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
- connect( filter, TQT_SIGNAL( signalProgress(int) ),
- this, TQT_SIGNAL( signalProgress(int) ));
- connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
- this, TQT_SIGNAL( signalClearProgressBar() ));
-
- connect( this, TQT_SIGNAL( signalStopActivity() ),
- filter, TQT_SLOT( stop() ));
+ connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+ this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+ connect( filter, TQ_SIGNAL( signalProgress(int) ),
+ this, TQ_SIGNAL( signalProgress(int) ));
+ connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+ this, TQ_SIGNAL( signalClearProgressBar() ));
+
+ connect( this, TQ_SIGNAL( signalStopActivity() ),
+ filter, TQ_SLOT( stop() ));
// load in the file (target is always local)
d->_active = true;
@@ -1027,15 +1027,15 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0));
// provide progress bar indication
- connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
- this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
- connect( filter, TQT_SIGNAL( signalProgress(int) ),
- this, TQT_SIGNAL( signalProgress(int) ));
- connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
- this, TQT_SIGNAL( signalClearProgressBar() ));
+ connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+ this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+ connect( filter, TQ_SIGNAL( signalProgress(int) ),
+ this, TQ_SIGNAL( signalProgress(int) ));
+ connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+ this, TQ_SIGNAL( signalClearProgressBar() ));
- connect( this, TQT_SIGNAL( signalStopActivity() ),
- filter, TQT_SLOT( stop() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ),
+ filter, TQ_SLOT( stop() ));
// load in the file (target is always local)
d->_active = true;
@@ -1229,7 +1229,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors)
kdDebug(KBABEL) << "checkUsingTool active" << endl;
d->_active=true;
d->_stop=false;
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
int index = 0;
bool hasErrors=false;
@@ -1256,7 +1256,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors)
kdDebug(KBABEL) << "checkUsingTool not active" << endl;
d->_active=false;
d->_stop=false;
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
emit signalClearProgressBar();
@@ -1268,7 +1268,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command)
kdDebug(KBABEL) << "modifyUsingTool active" << endl;
d->_active=true;
d->_stop=false;
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
int index = 0;
bool modified = false;
@@ -1334,7 +1334,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command)
kdDebug(KBABEL) << "modifyUsingTool not active" << endl;
d->_active=false;
d->_stop=false;
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
emit signalClearProgressBar();
}
@@ -1998,7 +1998,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
}
else
{
- TQString tempFile=kapp->tempSaveName(targetURL.path(0));
+ TQString tempFile=tdeApp->tempSaveName(targetURL.path(0));
status = writeFile(tempFile,overwrite);
@@ -2033,7 +2033,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
TQString Catalog::saveTempFile()
{
- TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po");
+ TQString filename = tdeApp->tempSaveName("/temp/kbabel_temp.po");
if( writeFile(filename) != OK )
{
filename = TQString();
@@ -2093,15 +2093,15 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
filter = static_cast<CatalogExportPlugin*>(factory->create(0, 0));
// provide progress bar indication
- connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
- this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
- connect( filter, TQT_SIGNAL( signalProgress(int) ),
- this, TQT_SIGNAL( signalProgress(int) ));
- connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
- this, TQT_SIGNAL( signalClearProgressBar() ));
+ connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+ this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+ connect( filter, TQ_SIGNAL( signalProgress(int) ),
+ this, TQ_SIGNAL( signalProgress(int) ));
+ connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+ this, TQ_SIGNAL( signalClearProgressBar() ));
- connect( this, TQT_SIGNAL( signalStopActivity() ),
- filter, TQT_SLOT( stop() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ),
+ filter, TQ_SLOT( stop() ));
// load in the file (target is always local)
kdDebug(KBABEL) << "writeFile active" << endl;
@@ -2504,7 +2504,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
kdDebug(KBABEL) << "findNext active" << endl;
d->_active=true;
d->_stop=false;
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
MiscSettings miscOptions = miscSettings();
@@ -2549,12 +2549,12 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->processEvents(10);
+ tdeApp->processEvents(10);
if( d->_stop || endReached)
{
kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl;
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "findNext not active" << endl;
d->_active=false;
d->_stop=false;
@@ -2763,7 +2763,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
}
}
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "findNext not active" << endl;
d->_active=false;
d->_stop=false;
@@ -2779,7 +2779,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
kdDebug(KBABEL) << "findPrev active" << endl;
d->_active=true;
d->_stop=false;
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
MiscSettings miscOptions = miscSettings();
@@ -2798,12 +2798,12 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->processEvents(10);
+ tdeApp->processEvents(10);
if( d->_stop || beginReached)
{
kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl;
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "findPrev active" << endl;
d->_active=false;
d->_stop=false;
@@ -3034,7 +3034,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
}
}
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "findPrev active" << endl;
d->_active=false;
d->_stop=false;
@@ -3080,7 +3080,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
return DiffOk;
}
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "diffv active" << endl;
d->_active=true;
d->_stop=false;
@@ -3155,11 +3155,11 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
bestId = (*it);
}
- kapp->processEvents(10);
+ tdeApp->processEvents(10);
if( d->_stop )
{
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug
(KBABEL) << "diffv not active" << endl;
@@ -3199,7 +3199,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
if( !d->diffCache.insert(entry,s) )
delete s;
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "diffv not active" << endl;
d->_active=false;
d->_stop=false;
@@ -3209,7 +3209,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
{
- connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "setDiffList active" << endl;
d->_active=true;
d->_stop=false;
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
{
oldPercent = percent;
emit signalProgress(percent);
- kapp->processEvents(10);
+ tdeApp->processEvents(10);
}
TQString id = (*it).msgid;
@@ -3259,7 +3259,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
emit signalClearProgressBar();
- disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+ disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
kdDebug(KBABEL) << "setDiffList not active" << endl;
d->_active=false;
d->_stop=false;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index f5c37309..402af6dc 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -44,8 +44,8 @@
#include <tqptrlist.h>
#include <tqvaluevector.h>
-#include <kdemacros.h>
-#include <kstandarddirs.h>
+#include <tdemacros.h>
+#include <tdestandarddirs.h>
class KDataTool;
class TQString;
@@ -107,7 +107,7 @@ struct DiffEntry
* @short Class, that represents a translation catalog(po-file)
* @author Matthias Kiefer <matthias.kiefer@gmx.de>
*/
-class KDE_EXPORT Catalog : public TQObject
+class TDE_EXPORT Catalog : public TQObject
{
TQ_OBJECT
@@ -188,7 +188,7 @@ public:
* @return context information found in the message comment
* @deprecated
*/
- TQString context(uint index) const KDE_DEPRECATED;
+ TQString context(uint index) const TDE_DEPRECATED;
/**
* Get the header for the current file.
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index c6dd1575..a1f12482 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -34,7 +34,7 @@
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQString;
@@ -79,7 +79,7 @@ enum ConversionStatus {
* @short Base class for Catalog import plugins
* @author Stanislav Visnovsky <visnovsky@kde.org>
*/
-class KDE_EXPORT CatalogImportPlugin: public TQObject
+class TDE_EXPORT CatalogImportPlugin: public TQObject
{
TQ_OBJECT
@@ -175,7 +175,7 @@ private:
* @short Base class for Catalog export plugins
* @author Stanislav Visnovsky <visnovsky@kde.org>
*/
-class KDE_EXPORT CatalogExportPlugin: public TQObject
+class TDE_EXPORT CatalogExportPlugin: public TQObject
{
TQ_OBJECT
diff --git a/kbabel/common/catalogitem.h b/kbabel/common/catalogitem.h
index bb02b1d8..6f2beba6 100644
--- a/kbabel/common/catalogitem.h
+++ b/kbabel/common/catalogitem.h
@@ -60,7 +60,7 @@ class CatalogItemPrivate;
* @short Class, representing an entry in a catalog
* @author Matthias Kiefer <matthias.kiefer@gmx.de>
*/
-class KDE_EXPORT CatalogItem
+class TDE_EXPORT CatalogItem
{
public:
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index d7236b80..287dc4d2 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -38,7 +38,7 @@
#include <tdeemailsettings.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdetempfile.h>
#include <stdlib.h>
diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h
index 552f88c5..55bb1432 100644
--- a/kbabel/common/catalogsettings.h
+++ b/kbabel/common/catalogsettings.h
@@ -37,7 +37,7 @@
#include <tqstring.h>
#include <tqregexp.h>
#include <tqdatetime.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQTextCodec;
class TQStringList;
@@ -45,7 +45,7 @@ class TQStringList;
namespace KBabel
{
-struct KDE_EXPORT SaveSettings
+struct TDE_EXPORT SaveSettings
{
bool autoUpdate;
bool updateLastTranslator;
@@ -74,7 +74,7 @@ struct KDE_EXPORT SaveSettings
int autoSaveDelay;
};
-struct KDE_EXPORT IdentitySettings
+struct TDE_EXPORT IdentitySettings
{
TQString authorName;
TQString authorLocalizedName;
@@ -98,7 +98,7 @@ struct KDE_EXPORT IdentitySettings
};
-struct KDE_EXPORT MiscSettings
+struct TDE_EXPORT MiscSettings
{
/**
* The char, that marks keyboard accelerators.
@@ -144,13 +144,13 @@ struct TagSettings
TQStringList argExpressions;
};
-KDE_EXPORT TQString charsetString(const int encoding);
-KDE_EXPORT TQString charsetString(const TQTextCodec *codec);
-KDE_EXPORT TQString GNUPluralForms(const TQString& lang);
+TDE_EXPORT TQString charsetString(const int encoding);
+TDE_EXPORT TQString charsetString(const TQTextCodec *codec);
+TDE_EXPORT TQString GNUPluralForms(const TQString& lang);
namespace Defaults
{
- class KDE_EXPORT Identity
+ class TDE_EXPORT Identity
{
public:
static TQString authorName();
@@ -161,7 +161,7 @@ namespace Defaults
static TQString timezone();
};
- class KDE_EXPORT Tag
+ class TDE_EXPORT Tag
{
public:
static TQStringList tagExpressions();
diff --git a/kbabel/common/editcmd.h b/kbabel/common/editcmd.h
index 5dc1c536..feaf1fec 100644
--- a/kbabel/common/editcmd.h
+++ b/kbabel/common/editcmd.h
@@ -35,12 +35,12 @@
#include "itempart.h"
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KBabel
{
-class KDE_EXPORT EditCommand
+class TDE_EXPORT EditCommand
{
public:
enum Commands { Invalid, Begin, End, Insert, Delete };
@@ -64,7 +64,7 @@ private:
};
-class KDE_EXPORT BeginCommand : public EditCommand
+class TDE_EXPORT BeginCommand : public EditCommand
{
public:
BeginCommand( const int index, const Part part ) : EditCommand(index,part) {}
@@ -73,7 +73,7 @@ public:
};
-class KDE_EXPORT EndCommand : public EditCommand
+class TDE_EXPORT EndCommand : public EditCommand
{
public:
EndCommand( const int index, const Part part ) : EditCommand(index,part) {}
@@ -83,7 +83,7 @@ public:
-class KDE_EXPORT DelTextCmd : public EditCommand
+class TDE_EXPORT DelTextCmd : public EditCommand
{
public:
int offset;
@@ -97,7 +97,7 @@ public:
bool merge( EditCommand* other);
};
-class KDE_EXPORT InsTextCmd : public DelTextCmd
+class TDE_EXPORT InsTextCmd : public DelTextCmd
{
public:
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index a85fb990..471660f0 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -68,11 +68,11 @@ KBabelMailer::~KBabelMailer()
void KBabelMailer::sendOneFile(const TQString& fileName)
{
if (!singleFileCompression) {
- kapp->invokeMailer("", "", "", "", "", "", fileName);
+ tdeApp->invokeMailer("", "", "", "", "", "", fileName);
} else {
const TQString archive ( createArchive( TQStringList( fileName ), TQFileInfo( fileName ).baseName() ) );
if ( !archive.isEmpty() ) {
- kapp->invokeMailer("", "", "", "", "", "", archive);
+ tdeApp->invokeMailer("", "", "", "", "", "", archive);
}
}
}
@@ -100,7 +100,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
TQString tempName( m_tempDir.name() );
tempName += fileName;
if ( TDEIO::NetAccess::download( url, tempName, m_parent ) )
- kapp->invokeMailer("", "", "", "", "", "", fileName);
+ tdeApp->invokeMailer("", "", "", "", "", "", fileName);
else
{
KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
@@ -110,7 +110,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
{
const TQString archive ( createArchive( TQStringList( url.url() ), url.filename() ) );
if ( !archive.isEmpty() ) {
- kapp->invokeMailer("", "", "", "", "", "", archive);
+ tdeApp->invokeMailer("", "", "", "", "", "", archive);
}
}
}
@@ -119,7 +119,7 @@ void KBabelMailer::sendFiles(TQStringList fileList, const TQString& initialName)
{
const TQString archive ( createArchive( fileList, initialName ) );
if ( !archive.isEmpty() ) {
- kapp->invokeMailer("", "", "", "", "", "", archive);
+ tdeApp->invokeMailer("", "", "", "", "", "", archive);
}
}
diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h
index fe1cfe89..265b0b6c 100644
--- a/kbabel/common/kbmailer.h
+++ b/kbabel/common/kbmailer.h
@@ -37,7 +37,7 @@
#define KBMAILER_H
#include <kbproject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ktempdir.h>
class TQWidget;
@@ -56,7 +56,7 @@ namespace KBabel
*
* @internal
*/
-class KDE_EXPORT KBabelMailer
+class TDE_EXPORT KBabelMailer
{
public:
/**
diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h
index f4983ab5..aa29df1a 100644
--- a/kbabel/common/kbproject.h
+++ b/kbabel/common/kbproject.h
@@ -43,7 +43,7 @@ namespace KBabel
{
class ProjectSettingsBase;
- class KDE_EXPORT Project : public TQObject, public TDEShared
+ class TDE_EXPORT Project : public TQObject, public TDEShared
{
TQ_OBJECT
diff --git a/kbabel/common/kbprojectmanager.cpp b/kbabel/common/kbprojectmanager.cpp
index 7b369ad7..e26edff6 100644
--- a/kbabel/common/kbprojectmanager.cpp
+++ b/kbabel/common/kbprojectmanager.cpp
@@ -32,7 +32,7 @@
**************************************************************************** */
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kbprojectmanager.h"
diff --git a/kbabel/common/kbprojectmanager.h b/kbabel/common/kbprojectmanager.h
index 40ec5884..388097aa 100644
--- a/kbabel/common/kbprojectmanager.h
+++ b/kbabel/common/kbprojectmanager.h
@@ -35,14 +35,14 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kbproject.h"
namespace KBabel
{
- class KDE_EXPORT ProjectManager
+ class TDE_EXPORT ProjectManager
{
public:
static Project::Ptr open( const TQString& file );
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 5e359a91..3ebd2a88 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -33,7 +33,7 @@
#include "msgfmt.h"
#include <tdeapplication.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tqfileinfo.h>
#include <tqdir.h>
@@ -58,10 +58,10 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
TDEProcess proc;
- connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
- connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
+ connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this,TQ_SLOT(addToOutput(TDEProcess*,char *, int )));
+ connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this,TQ_SLOT(addToOutput(TDEProcess*,char *, int)));
// remove last output
_output="";
@@ -100,10 +100,10 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
TDEProcess proc;
proc.setUseShell(true);
- connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
- connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
+ connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ this,TQ_SLOT(addToOutput(TDEProcess*,char *, int )));
+ connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this,TQ_SLOT(addToOutput(TDEProcess*,char *, int)));
// remove last output
_output="";
@@ -141,7 +141,7 @@ void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen)
TQString Msgfmt::tempSaveName()
{
- return kapp->tempSaveName("/tmp/kbabel_msgfmt.po");
+ return tdeApp->tempSaveName("/tmp/kbabel_msgfmt.po");
}
#include "msgfmt.moc"
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 42e28a60..b474fe5d 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -34,7 +34,7 @@
#define MSGFMT_H
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TDEProcess;
class TQString;
@@ -42,7 +42,7 @@ class TQString;
namespace KBabel
{
-class KDE_EXPORT Msgfmt : private TQObject
+class TDE_EXPORT Msgfmt : private TQObject
{
TQ_OBJECT
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 17d930d9..95df4510 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -39,7 +39,7 @@
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksavefile.h>
#include <tqdatastream.h>
@@ -399,7 +399,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
while( lexer->lastToken != T_EOF && success==OK)
{
- if( interactive ) kapp->processEvents(10);
+ if( interactive ) tdeApp->processEvents(10);
if( stopStaticRead )
{
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
case T_MSGID:
case T_MSGIDPLURAL: {
- kapp->processEvents(10);
+ tdeApp->processEvents(10);
// if stopped, return not found
if( stopStaticRead )
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 70ba652a..775e2968 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -57,7 +57,7 @@ class FindOptions;
/**
* PO-file information class, with transparent caching of information.
*/
-class KDE_EXPORT PoInfo
+class TDE_EXPORT PoInfo
{
public:
int total;
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 8ac63cd4..3050d971 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -38,7 +38,7 @@
#include <tqstring.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdespell.h>
diff --git a/kbabel/common/projectsettings.h b/kbabel/common/projectsettings.h
index 556088dd..c8b379ec 100644
--- a/kbabel/common/projectsettings.h
+++ b/kbabel/common/projectsettings.h
@@ -117,7 +117,7 @@ struct SourceContextSettings
*/
namespace Defaults
{
- class KDE_EXPORT Spellcheck
+ class TDE_EXPORT Spellcheck
{
public:
static TQString ignoreURL();
@@ -130,7 +130,7 @@ namespace Defaults
static KSpellConfig* defaultsettings;
};
- class KDE_EXPORT CatalogManager
+ class TDE_EXPORT CatalogManager
{
public:
static TQString ignoreURL();
diff --git a/kbabel/common/regexpextractor.h b/kbabel/common/regexpextractor.h
index 75b6e0d3..174416a2 100644
--- a/kbabel/common/regexpextractor.h
+++ b/kbabel/common/regexpextractor.h
@@ -39,12 +39,12 @@
#include <tqstringlist.h>
#include <tqvaluelist.h>
#include <tqregexp.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KBabel
{
-struct KDE_EXPORT MatchedEntryInfo{
+struct TDE_EXPORT MatchedEntryInfo{
uint index;
TQString extracted;
};
@@ -54,7 +54,7 @@ struct KDE_EXPORT MatchedEntryInfo{
* class to extract entries based on regexps from a string
* @author Andrea Rizzi <rizzi@kde.org>
*/
-class KDE_EXPORT RegExpExtractor
+class TDE_EXPORT RegExpExtractor
{
public:
diff --git a/kbabel/common/tagextractor.h b/kbabel/common/tagextractor.h
index d6018f37..bf178a47 100644
--- a/kbabel/common/tagextractor.h
+++ b/kbabel/common/tagextractor.h
@@ -43,7 +43,7 @@ namespace KBabel
* class to extract tags from a string
* @author Andrea Rizzi <rizzi@kde.org>
*/
-class KDE_EXPORT TagExtractor : public RegExpExtractor
+class TDE_EXPORT TagExtractor : public RegExpExtractor
{
public: