diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 41599e4a2..f508664c8 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -1452,7 +1452,7 @@ TerminalOptions= Path= Type=Application Terminal=0 -X-TDE-StartupNotify=true +X-TDE-StartupNotify=true X-DCOP-ServiceType=Multi Categories=Qt;TDE;Network @@ -1475,7 +1475,7 @@ needed Use true if terminal is needed, text application -Show bouncy cursor, +Show bouncy cursor, disable if it doesn't work. Has app started ok? diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index f5c38cde1..593290d86 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -1501,7 +1501,7 @@ void KDIconView::slotClipboardDataChanged() KURL::List lst; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) + if ( data->provides( "application/x-tde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( KonqDrag::decodeIsCutSelection( data ) ) (void) KURLDrag::decode( data, lst ); diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index 481339b30..e035856d7 100644 --- a/klipper/historyitem.cpp +++ b/klipper/historyitem.cpp @@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource ) TQMap metaData; if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) - TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); + TQByteArray a = aSource.encodedData( "application/x-tde-cutselection" ); bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp index 0d54ce44c..ea8fb7ffd 100644 --- a/klipper/historyurlitem.cpp +++ b/klipper/historyurlitem.cpp @@ -41,7 +41,7 @@ TQMimeSource* HistoryURLItem::mimeSource() const { KMultipleDrag* drag = new KMultipleDrag; drag->addDragObject( new KURLDrag( urls, metaData )); // from KonqDrag (libkonq) - TQStoredDrag* cutdrag = new TQStoredDrag( "application/x-kde-cutselection" ); + TQStoredDrag* cutdrag = new TQStoredDrag( "application/x-tde-cutselection" ); TQByteArray a; TQCString s ( cut ? "1" : "0" ); a.resize( s.length() + 1 ); // trailing zero diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index ee88a6cba..8368d4d37 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -199,7 +199,7 @@ void KonqSidebarDirTreeItem::paste() // move or not move ? bool move = false; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-kde-cutselection" ) ) { + if ( data->provides( "application/x-tde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; } diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index d6eb37857..0ba22363f 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -158,7 +158,7 @@ void KonqSidebarTreeTopLevelItem::paste() // move or not move ? bool move = false; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-kde-cutselection" ) ) { + if ( data->provides( "application/x-tde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; } diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 9f08dfb3c..ea1b19bb0 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -419,7 +419,7 @@ void KonqDirPart::slotClipboardDataChanged() KURL::List lst; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) + if ( data->provides( "application/x-tde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( KonqDrag::decodeIsCutSelection( data ) ) (void) KURLDrag::decode( data, lst ); diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index b25b7b1c2..bb05fc8d8 100644 --- a/libkonq/konq_drag.cc +++ b/libkonq/konq_drag.cc @@ -34,7 +34,7 @@ const char* KonqIconDrag::format( int i ) const else if ( i == 1 ) return "text/uri-list"; else if ( i == 2 ) - return "application/x-kde-cutselection"; + return "application/x-tde-cutselection"; else if ( i == 3 ) return "text/plain"; else if ( i == 4 ) //These two are imporant because they may end up being format 0, @@ -60,7 +60,7 @@ TQByteArray KonqIconDrag::encodedData( const char* mime ) const a.resize( s.length() + 1 ); // trailing zero memcpy( a.data(), s.data(), s.length() + 1 ); } - else if ( mimetype == "application/x-kde-cutselection" ) { + else if ( mimetype == "application/x-tde-cutselection" ) { TQCString s ( m_bCutSelection ? "1" : "0" ); a.resize( s.length() + 1 ); // trailing zero memcpy( a.data(), s.data(), s.length() + 1 ); @@ -115,7 +115,7 @@ bool KonqIconDrag::canDecode( const TQMimeSource* e ) { return e->provides( "application/x-qiconlist" ) || e->provides( "text/uri-list" ) || - e->provides( "application/x-kde-cutselection" ); + e->provides( "application/x-tde-cutselection" ); } void KonqIconDrag::append( const TQIconDragItem &item, const TQRect &pr, @@ -141,14 +141,14 @@ void KonqIconDrag2::append( const TQIconDragItem &item, const TQRect &pr, const char* KonqIconDrag2::format( int i ) const { if ( i == 6 ) - return "application/x-kde-urilist"; + return "application/x-tde-urilist"; return KonqIconDrag::format( i ); } TQByteArray KonqIconDrag2::encodedData( const char* mime ) const { TQCString mimetype( mime ); - if ( mimetype == "application/x-kde-urilist" ) + if ( mimetype == "application/x-tde-urilist" ) { TQByteArray a; int c=0; @@ -215,11 +215,11 @@ const char* KonqDrag::format( int i ) const if ( i == 0 ) return "text/uri-list"; else if ( i == 1 ) - return "application/x-kde-cutselection"; + return "application/x-tde-cutselection"; else if ( i == 2 ) return "text/plain"; else if ( i == 3 ) - return "application/x-kde-urilist"; + return "application/x-tde-urilist"; else return 0; } @@ -241,11 +241,11 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const a.resize(c+1); a[c] = 0; } - else if ( mimetype == "application/x-kde-urilist" ) + else if ( mimetype == "application/x-tde-urilist" ) { return TQUriDrag::encodedData( "text/uri-list" ); } - else if ( mimetype == "application/x-kde-cutselection" ) + else if ( mimetype == "application/x-tde-cutselection" ) { TQCString s ( m_bCutSelection ? "1" : "0" ); a.resize( s.length() + 1 ); // trailing zero @@ -271,7 +271,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->encodedData( "application/x-tde-cutselection" ); if ( a.isEmpty() ) return false; else diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index cd9a61174..6e899c604 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -125,7 +125,7 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP // move or not move ? bool move = false; TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "application/x-kde-cutselection" ) ) { + if ( data->provides( "application/x-tde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1203) << "move (from clipboard data) = " << move << endl; }