summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 21:09:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 21:09:50 -0600
commite43514f1d545aebee930c76d96c9ec32cf10822b (patch)
tree7caa14e83889d45a78ca927986740f45a4db0d82
parent1192a5120d9b5311d089985d45761ce33bc00014 (diff)
downloadkoffice-e43514f1d545aebee930c76d96c9ec32cf10822b.tar.gz
koffice-e43514f1d545aebee930c76d96c9ec32cf10822b.zip
Rename additional members for tqt3
-rw-r--r--filters/kword/html/import/khtmlreader.cpp8
-rw-r--r--kexi/plugins/macros/lib/metamethod.cpp4
-rw-r--r--kugar/part/kugar_part.cpp2
-rw-r--r--lib/kross/api/eventsignal.cpp2
-rw-r--r--lib/kross/api/eventslot.cpp2
-rw-r--r--lib/kross/api/qtobject.cpp4
6 files changed, 11 insertions, 11 deletions
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 8545fb0dc..ab68e9f3b 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -40,8 +40,8 @@ KHTMLReader::KHTMLReader(KWDWriter *w)
}
// if a troll ever sees this, he can't kill me anyway. (and he should kill dfaure first)
-void qt_enter_modal( TQWidget *widget );
-void qt_leave_modal( TQWidget *widget );
+void tqt_enter_modal( TQWidget *widget );
+void tqt_leave_modal( TQWidget *widget );
bool KHTMLReader::filter(KURL url)
@@ -66,9 +66,9 @@ bool KHTMLReader::filter(KURL url)
//FIXME use synchronous IO instead of this hack if possible.
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- qt_enter_modal(&dummy);
+ tqt_enter_modal(&dummy);
tqApp->enter_loop();
- qt_leave_modal(&dummy);
+ tqt_leave_modal(&dummy);
return _it_worked;
}
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp
index 05bd22c32..188397808 100644
--- a/kexi/plugins/macros/lib/metamethod.cpp
+++ b/kexi/plugins/macros/lib/metamethod.cpp
@@ -321,11 +321,11 @@ KSharedPtr<Variable> MetaMethod::invoke(Variable::List arguments)
switch( d->type ) {
case Signal: {
int index = d->object->indexOfSignal( d->signature.latin1() );
- obj->qt_emit(index, qu);
+ obj->tqt_emit(index, qu);
} break;
case Slot: {
int index = d->object->indexOfSlot( d->signature.latin1() );
- obj->qt_invoke(index, qu);
+ obj->tqt_invoke(index, qu);
} break;
default: {
throw Exception("Unknown type.");
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 894dd1eb0..5343916b0 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -81,7 +81,7 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ )
{
for ( KoView * v = vs.first();v;v = vs.next() )
{
- ok = static_cast<KugarView*>( v->qt_cast( "KugarView" ) ) ->renderReport();
+ ok = static_cast<KugarView*>( v->tqt_cast( "KugarView" ) ) ->renderReport();
if ( !ok )
break;
}
diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp
index 8f4d2c50b..2a711a0b8 100644
--- a/lib/kross/api/eventsignal.cpp
+++ b/lib/kross/api/eventsignal.cpp
@@ -59,7 +59,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen
throw new Exception(TQString("No such signal '%1'.").arg(n));
TQUObject* uo = QtObject::toTQUObject(n, arguments);
- m_sender->qt_emit(signalid, uo); // emit the signal
+ m_sender->tqt_emit(signalid, uo); // emit the signal
delete [] uo;
return new Variant( TQVariant(true,0) );
diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp
index 3f6482db5..bae298727 100644
--- a/lib/kross/api/eventslot.cpp
+++ b/lib/kross/api/eventslot.cpp
@@ -59,7 +59,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments)
throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(n)) );
TQUObject* uo = QtObject::toTQUObject(n, arguments);
- m_receiver->qt_invoke(slotid, uo); // invoke the slot
+ m_receiver->tqt_invoke(slotid, uo); // invoke the slot
delete [] uo;
return new Variant( TQVariant(true,0) );
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 5fc1a36a0..1e34c7154 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -178,7 +178,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(name)) );
TQUObject* uo = QtObject::toTQUObject(name, args);
- m_object->qt_invoke(slotid, uo);
+ m_object->tqt_invoke(slotid, uo);
delete [] uo;
return new Variant( TQVariant(true,0) );
@@ -204,7 +204,7 @@ Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args)
int signalid = m_object->metaObject()->findSignal(name.latin1(), false);
if(signalid < 0)
throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").arg(name)) );
- m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject*
+ m_object->tqt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject*
return 0;
}