summaryrefslogtreecommitdiffstats
path: root/tdeio
diff options
context:
space:
mode:
Diffstat (limited to 'tdeio')
-rw-r--r--tdeio/kssl/ksslcertificatecache.cpp4
-rw-r--r--tdeio/kssl/ksslsigners.cpp4
-rw-r--r--tdeio/misc/kpac/proxyscout.cpp2
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp2
-rw-r--r--tdeio/tdefile/tdefilemetainfowidget.cpp14
-rw-r--r--tdeio/tdeio/kscan.h4
-rw-r--r--tdeio/tdeio/netaccess.cpp2
7 files changed, 16 insertions, 16 deletions
diff --git a/tdeio/kssl/ksslcertificatecache.cpp b/tdeio/kssl/ksslcertificatecache.cpp
index 2eecd66d6..226e21c71 100644
--- a/tdeio/kssl/ksslcertificatecache.cpp
+++ b/tdeio/kssl/ksslcertificatecache.cpp
@@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
"cacheGetHostList(KSSLCertificate)",
data, rettype, retval);
- if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (rc && rettype == "TQStringList") {
TQDataStream retStream(retval, IO_ReadOnly);
TQStringList drc;
retStream >> drc;
@@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) {
"getKDEKeyByEmail(TQString)",
data, rettype, retval);
- if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (rc && rettype == "TQStringList") {
TQDataStream retStream(retval, IO_ReadOnly);
TQStringList drc;
retStream >> drc;
diff --git a/tdeio/kssl/ksslsigners.cpp b/tdeio/kssl/ksslsigners.cpp
index 028ddf555..2392f4a36 100644
--- a/tdeio/kssl/ksslsigners.cpp
+++ b/tdeio/kssl/ksslsigners.cpp
@@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
"caList()",
data, rettype, retval);
- if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (rc && rettype == "TQStringList") {
TQDataStream retStream(retval, IO_ReadOnly);
retStream >> drc;
}
@@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) {
"caGetCert(TQString)",
data, rettype, retval);
- if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) {
+ if (rc && rettype == "TQString") {
TQDataStream retStream(retval, IO_ReadOnly);
retStream >> drc;
}
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a8f0a4062..695d06858 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -130,7 +130,7 @@ namespace KPAC
for ( RequestQueue::ConstIterator it = m_requestQueue.begin();
it != m_requestQueue.end(); ++it )
{
- TQCString type = TQSTRING_OBJECT_NAME_STRING;
+ TQCString type = "TQString";
TQByteArray data;
TQDataStream ds( data, IO_WriteOnly );
if ( success ) ds << handleRequest( ( *it ).url );
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index ea2723fd0..cab15872c 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges()
kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl;
- if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if (nameArea->inherits("TQLineEdit"))
{
TQString n = ((TQLineEdit *) nameArea)->text();
// Remove trailing spaces (#4345)
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index 4590ee381..0a1ccbfbc 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -196,7 +196,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget()
if (m_validator)
{
- if (m_validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING))
+ if (m_validator->inherits("TQIntValidator"))
{
sb->setMinValue(static_cast<TQIntValidator*>(m_validator)->bottom());
sb->setMaxValue(static_cast<TQIntValidator*>(m_validator)->top());
@@ -301,7 +301,7 @@ void KFileMetaInfoWidget::reparentValidator( TQWidget *widget,
void KFileMetaInfoWidget::slotChanged(bool value)
{
- Q_ASSERT(m_widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQComboBox"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@@ -309,7 +309,7 @@ void KFileMetaInfoWidget::slotChanged(bool value)
void KFileMetaInfoWidget::slotChanged(int value)
{
- Q_ASSERT(m_widget->inherits(TQSPINBOX_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQSpinBox"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@@ -342,7 +342,7 @@ void KFileMetaInfoWidget::slotLineEditChanged(const TQString& value)
// that may be a little expensive for long texts, but what can we do?
void KFileMetaInfoWidget::slotMultiLineEditChanged()
{
- Q_ASSERT(m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQTextEdit"));
m_value = TQVariant( static_cast<const TQTextEdit*>( sender() )->text() );
emit valueChanged(m_value);
m_dirty = true;
@@ -350,7 +350,7 @@ void KFileMetaInfoWidget::slotMultiLineEditChanged()
void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
{
- Q_ASSERT(m_widget->inherits(TQDATEEDIT_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQDateEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@@ -358,7 +358,7 @@ void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
{
- Q_ASSERT(m_widget->inherits(TQTIMEEDIT_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQTimeEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
@@ -366,7 +366,7 @@ void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value)
{
- Q_ASSERT(m_widget->inherits(TQDATETIMEEDIT_OBJECT_NAME_STRING));
+ Q_ASSERT(m_widget->inherits("TQDateTimeEdit"));
m_value = TQVariant(value);
emit valueChanged(m_value);
m_dirty = true;
diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h
index 940b8ceaa..0ad71d51f 100644
--- a/tdeio/tdeio/kscan.h
+++ b/tdeio/tdeio/kscan.h
@@ -203,7 +203,7 @@ protected:
KScanDialogFactory( TQObject *parent=0, const char *name=0 );
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* classname = TQOBJECT_OBJECT_NAME_STRING,
+ const char* classname = "TQObject",
const TQStringList &args = TQStringList() );
@@ -339,7 +339,7 @@ protected:
KOCRDialogFactory( TQObject *parent=0, const char *name=0 );
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
- const char* className = TQOBJECT_OBJECT_NAME_STRING,
+ const char* className = "TQObject",
const TQStringList &args = TQStringList() );
diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index 132c87a50..9c4def4ba 100644
--- a/tdeio/tdeio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -487,7 +487,7 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
TQMetaObject *meta = job->metaObject();
- static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
+ static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)";
if ( meta->findSignal( dataSignal ) != -1 ) {
connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );