diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-06 00:38:29 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:04:47 +0200 |
commit | c1a037c8d0250886e3e984d6171d798b5a60dc9d (patch) | |
tree | f19518053464bcc742d9029f68ec33b377465dbf /kdecore | |
parent | 18aecb8ec08ac370cb99e78e63acee0275e6334c (diff) | |
download | tdelibs-c1a037c8d0250886e3e984d6171d798b5a60dc9d.tar.gz tdelibs-c1a037c8d0250886e3e984d6171d798b5a60dc9d.zip |
Rename tqencodedData to fix bindings
(cherry picked from commit ca1f1a08ecb01139487ff2f0591f97b97164c4e4)
Diffstat (limited to 'kdecore')
-rw-r--r-- | kdecore/kclipboard.cpp | 4 | ||||
-rw-r--r-- | kdecore/kmultipledrag.cpp | 6 | ||||
-rw-r--r-- | kdecore/kmultipledrag.h | 2 | ||||
-rw-r--r-- | kdecore/kurldrag.cpp | 8 | ||||
-rw-r--r-- | kdecore/kurldrag.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kdecore/kclipboard.cpp b/kdecore/kclipboard.cpp index 86250ea4f..b6b4fc357 100644 --- a/kdecore/kclipboard.cpp +++ b/kdecore/kclipboard.cpp @@ -56,7 +56,7 @@ public: while ( (format = src->format( i++ )) ) { byteArray = new TQByteArray(); - *byteArray = src->tqencodedData( format ).copy(); + *byteArray = src->encodedData( format ).copy(); m_data.append( byteArray ); m_formats.append( format ); } @@ -74,7 +74,7 @@ public: virtual bool provides( const char *mimeType ) const { return ( m_formats.find( mimeType ) > -1 ); } - virtual TQByteArray tqencodedData( const char *format ) const + virtual TQByteArray encodedData( const char *format ) const { int index = m_formats.find( format ); if ( index > -1 ) diff --git a/kdecore/kmultipledrag.cpp b/kdecore/kmultipledrag.cpp index 94abe689e..29d56bd85 100644 --- a/kdecore/kmultipledrag.cpp +++ b/kdecore/kmultipledrag.cpp @@ -39,9 +39,9 @@ void KMultipleDrag::addDragObject( TQDragObject *dragObject ) m_numberFormats.append( i ); // e.g. if it supports two formats, 0 and 1, store 2. } -TQByteArray KMultipleDrag::tqencodedData( const char *mime ) const +TQByteArray KMultipleDrag::encodedData( const char *mime ) const { - //kdDebug() << "KMultipleDrag::tqencodedData " << mime << endl; + //kdDebug() << "KMultipleDrag::encodedData " << mime << endl; // Iterate over the drag objects, and find the format in the right one TQPtrListIterator<TQDragObject> it( m_dragObjects ); for ( ; it.current(); ++it ) @@ -49,7 +49,7 @@ TQByteArray KMultipleDrag::tqencodedData( const char *mime ) const for ( int i = 0; it.current()->format( i ); ++i ) { if ( ::qstrcmp( it.current()->format( i ), mime ) == 0 ) - return it.current()->tqencodedData( mime ); + return it.current()->encodedData( mime ); } } return TQByteArray(); diff --git a/kdecore/kmultipledrag.h b/kdecore/kmultipledrag.h index 2490ec694..47bfbd378 100644 --- a/kdecore/kmultipledrag.h +++ b/kdecore/kmultipledrag.h @@ -80,7 +80,7 @@ public: * @return the data, or a null byte array if not found * @reimp */ - virtual TQByteArray tqencodedData( const char *mime ) const; + virtual TQByteArray encodedData( const char *mime ) const; /** * Returns the @p i'th supported format, or 0. diff --git a/kdecore/kurldrag.cpp b/kdecore/kurldrag.cpp index e0a7be227..7147f7a74 100644 --- a/kdecore/kurldrag.cpp +++ b/kdecore/kurldrag.cpp @@ -87,7 +87,7 @@ KURLDrag * KURLDrag::newDrag( const KURL::List &urls, const TQMap<TQString, TQSt bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris ) { if ( e->provides( "application/x-kde-urilist" ) ) { - TQByteArray payload = e->tqencodedData( "application/x-kde-urilist" ); + TQByteArray payload = e->encodedData( "application/x-kde-urilist" ); if ( payload.size() ) { uint c=0; const char* d = payload.data(); @@ -128,7 +128,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T { if ( decode( e, uris ) ) // first decode the URLs (see above) { - TQByteArray ba = e->tqencodedData( "application/x-kio-metadata" ); + TQByteArray ba = e->encodedData( "application/x-kio-metadata" ); if ( ba.size() ) { TQString s = ba.data(); @@ -187,12 +187,12 @@ const char * KURLDrag::format( int i ) const else return 0; } -TQByteArray KURLDrag::tqencodedData( const char* mime ) const +TQByteArray KURLDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::tqencodedData( mime ); + return TQUriDrag::encodedData( mime ); else if ( mimetype == "text/plain" ) { TQStringList uris; diff --git a/kdecore/kurldrag.h b/kdecore/kurldrag.h index 019119600..3e407cd1a 100644 --- a/kdecore/kurldrag.h +++ b/kdecore/kurldrag.h @@ -145,7 +145,7 @@ public: /// @reimp virtual const char * format( int i ) const; /// @reimp - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; protected: /** |