Update for tqt3

4 files changed, 18 insertions, 18 deletions

diff --git a/PerlTQt/TQt.pm b/PerlTQt/TQt.pm
index 0b8a5c9..dee56b5 100644
--- a/PerlTQt/TQt.pm
+++ b/PerlTQt/TQt.pm
@@ -793,10 +793,10 @@ sub inheritSuperSigSlots {
                    TQt::_internal::installsignal("$class\::$ssn");
                }
             }
-            TQt::_internal::installqt_invoke($class . '::qt_invoke')
-                if( !defined &{ $class. '::qt_invoke' } && exists $meta->{slots} && @{ $meta->{slots} });
-            TQt::_internal::installqt_invoke($class . '::qt_emit')
-                if( !defined &{ $class. '::qt_emit' } && exists $meta->{signals} && @{ $meta->{signals} });
+            TQt::_internal::installqt_invoke($class . '::tqt_invoke')
+                if( !defined &{ $class. '::tqt_invoke' } && exists $meta->{slots} && @{ $meta->{slots} });
+            TQt::_internal::installqt_invoke($class . '::tqt_emit')
+                if( !defined &{ $class. '::tqt_emit' } && exists $meta->{signals} && @{ $meta->{signals} });
         }
     }
 }
diff --git a/PerlTQt/lib/TQt/signals.pm b/PerlTQt/lib/TQt/signals.pm
index 1f454c1..d0c3275 100644
--- a/PerlTQt/lib/TQt/signals.pm
+++ b/PerlTQt/lib/TQt/signals.pm
@@ -18,11 +18,11 @@ sub import {
     my $self = shift;
     my $caller = $self eq "TQt::signals" ? (caller)[0] : $self;
     my $parent = ${ $caller . '::ISA' }[0];
-    my $parent_qt_emit = $parent . '::qt_emit';
+    my $parent_qt_emit = $parent . '::tqt_emit';
 
-    TQt::_internal::installqt_invoke($caller . '::qt_emit') unless defined &{ $caller. '::qt_emit' };
+    TQt::_internal::installqt_invoke($caller . '::tqt_emit') unless defined &{ $caller. '::tqt_emit' };
 
-#    *{ $caller . '::qt_emit' } = sub {
+#    *{ $caller . '::tqt_emit' } = sub {
 #	my $meta = \%{ $caller . '::META' };
 #	die unless $meta->{object};
 #	my $offset = $_[0] - $meta->{object}->signalOffset;
@@ -32,7 +32,7 @@ sub import {
 #	} else {
 #	    TQt::this()->$parent_qt_emit(@_);
 #	}
-#    } unless defined &{ $caller . '::qt_emit' };
+#    } unless defined &{ $caller . '::tqt_emit' };
 
     my $meta = \%{ $caller . '::META' };
     croak "Odd number of arguments in signal declaration" if @_%2;
diff --git a/PerlTQt/lib/TQt/slots.pm b/PerlTQt/lib/TQt/slots.pm
index c12990e..cfbcff1 100644
--- a/PerlTQt/lib/TQt/slots.pm
+++ b/PerlTQt/lib/TQt/slots.pm
@@ -16,11 +16,11 @@ sub import {
     my $self = shift;
     my $caller = $self eq "TQt::slots" ? (caller)[0] : $self;
     my $parent = ${ $caller . '::ISA' }[0];
-    my $parent_qt_invoke = $parent . '::qt_invoke';
+    my $parent_qt_invoke = $parent . '::tqt_invoke';
 
-    TQt::_internal::installqt_invoke($caller . '::qt_invoke') unless defined &{ $caller. '::qt_invoke' };
+    TQt::_internal::installqt_invoke($caller . '::tqt_invoke') unless defined &{ $caller. '::tqt_invoke' };
 
-#    *{ $caller . '::qt_invoke' } = sub {
+#    *{ $caller . '::tqt_invoke' } = sub {
 #	my $meta = \%{ $caller . '::META' };
 #	die unless $meta->{object};
 #	my $offset = $_[0] - $meta->{object}->slotOffset;
@@ -30,7 +30,7 @@ sub import {
 #	} else {
 #	    TQt::this()->$parent_qt_invoke(@_);
 #	}
-#    } unless defined &{ $caller . '::qt_invoke' };
+#    } unless defined &{ $caller . '::tqt_invoke' };
 
     my $meta = \%{ $caller . '::META' };
     croak "Odd number of arguments in slot declaration" if @_%2;
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 261c179..3de8b85 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -71,10 +71,10 @@ $exe = basename $0;
 public:
     virtual TQMetaObject *metaObject() const;
     virtual const char *className() const;
-    virtual void* qt_cast( const char* );
-    virtual bool qt_invoke( int, TQUObject* );
-    virtual bool qt_emit( int, TQUObject* );
-    virtual bool qt_property( int, int, TQVariant* );
+    virtual void* tqt_cast( const char* );
+    virtual bool tqt_invoke( int, TQUObject* );
+    virtual bool tqt_emit( int, TQUObject* );
+    virtual bool tqt_property( int, int, TQVariant* );
     static TQMetaObject* staticMetaObject();
     TQObject* qObject();
     static TQString tr( const char *, const char * = 0 );
@@ -149,8 +149,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
 public:
     virtual TQMetaObject *metaObject() const;
     virtual const char *className() const;
-    virtual bool qt_invoke( int, TQUObject* );
-    virtual bool qt_emit( int, TQUObject* );
+    virtual bool tqt_invoke( int, TQUObject* );
+    virtual bool tqt_emit( int, TQUObject* );
     static TQString tr( const char *, const char * = 0 );
     static TQString trUtf8( const char *, const char * = 0 );
 private: