From ca1f1a08ecb01139487ff2f0591f97b97164c4e4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 6 Dec 2011 00:38:29 -0600
Subject: Rename tqencodedData to fix bindings

---
 kio/bookmarks/kbookmarkdrag.cc | 12 ++++++------
 kio/bookmarks/kbookmarkdrag.h  |  2 +-
 kio/kio/paste.cpp              |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kio')

diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc
index 358e329a9..d13893eed 100644
--- a/kio/bookmarks/kbookmarkdrag.cc
+++ b/kio/bookmarks/kbookmarkdrag.cc
@@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList<KBookmark> & bookmarks, const TQ
     : TQUriDrag( urls, dragSource, name ), m_bookmarks( bookmarks ), m_doc("xbel")
 {
     // We need to create the XML for this drag right now and not
-    // in tqencodedData because when cutting a folder, the children
-    // wouldn't be part of the bookmarks anymore, when tqencodedData
+    // in encodedData because when cutting a folder, the children
+    // wouldn't be part of the bookmarks anymore, when encodedData
     // is requested.
     TQDomElement elem = m_doc.createElement("xbel");
     m_doc.appendChild( elem );
@@ -76,16 +76,16 @@ const char* KBookmarkDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const
+TQByteArray KBookmarkDrag::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 == "application/x-xbel" )
     {
         a = m_doc.toCString();
-        //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl;
+        //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl;
     }
     else if ( mimetype == "text/plain" )
     {
@@ -117,7 +117,7 @@ TQValueList<KBookmark> KBookmarkDrag::decode( const TQMimeSource * e )
     TQValueList<KBookmark> bookmarks;
     if ( e->provides("application/x-xbel") )
     {
-        TQByteArray s( e->tqencodedData("application/x-xbel") );
+        TQByteArray s( e->encodedData("application/x-xbel") );
         //kdDebug(7043) << "KBookmarkDrag::decode s=" << TQCString(s) << endl;
         TQDomDocument doc;
         doc.setContent( s );
diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h
index c67f1ea19..c213f2d93 100644
--- a/kio/bookmarks/kbookmarkdrag.h
+++ b/kio/bookmarks/kbookmarkdrag.h
@@ -43,7 +43,7 @@ public:
     virtual ~KBookmarkDrag() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* mime ) const;
+    virtual TQByteArray encodedData( const char* mime ) const;
 
     static bool canDecode( const TQMimeSource * e );
     static TQValueList<KBookmark> decode( const TQMimeSource * e );
diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index 5a74c3e48..99714ffa7 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -137,7 +137,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
     if ( clipboard ) {
         data = TQApplication::tqclipboard()->data();
     }
-    const TQByteArray ba = data->tqencodedData( chosenFormat );
+    const TQByteArray ba = data->encodedData( chosenFormat );
     return pasteDataAsyncTo( new_url, ba );
 }
 #endif
@@ -147,7 +147,7 @@ KIO_EXPORT bool KIO::isClipboardEmpty()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   TQMimeSource *data = TQApplication::tqclipboard()->data();
-  if ( data->provides( "text/uri-list" ) && data->tqencodedData( "text/uri-list" ).size() > 0 )
+  if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 )
     return false;
 #else
   // Happens with some versions of Qt Embedded... :/
@@ -194,7 +194,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
       if ( formats.size() > 1 ) {
           return chooseAndPaste( dest_url, data, formats, dialogText, widget, clipboard );
       }
-      ba = data->tqencodedData( formats.first() );
+      ba = data->encodedData( formats.first() );
   }
   if ( ba.size() == 0 )
   {
-- 
cgit v1.2.1