TDE
/
tdebase
9
4
Fork 1
Code Issues 116 Pull Requests 10 Releases Wiki Activity

Update XDG mimetypes.

Browse Source
pull/2/head
Darrell Anderson 11 years ago
parent 41044ad489
commit 7d025dfef0
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
doc/userguide/tde-for-admins.docbook
Unescape View File

@ -1452,7 +1452,7 @@ TerminalOptions=<co id="co-terminaloptions"/>
Path=<co id="co-path"/>
Type=Application<co id="co-type"/>
Terminal=0<co id="co-terminal"/>
X-TDE-StartupNotify=true<co id="co-x-kde-startupnotify"/>
X-TDE-StartupNotify=true<co id="co-x-tde-startupnotify"/>
X-DCOP-ServiceType=Multi<co id="co-x-dcop-servicetype"/>
Categories=Qt;TDE;Network<co id="co-categories"/>
</programlisting>
@ -1475,7 +1475,7 @@ needed</para>
<callout arearefs="co-terminal"><para>Use true if terminal is needed,
text application</para>
</callout>
<callout arearefs="co-x-kde-startupnotify"><para>Show bouncy cursor,
<callout arearefs="co-x-tde-startupnotify"><para>Show bouncy cursor,
disable if it doesn't work.</para>
</callout>
<callout arearefs="co-x-dcop-servicetype"><para>Has app started ok?

2
kdesktop/kdiconview.cc
Unescape View File

@ -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 );

2
klipper/historyitem.cpp
Unescape View File

@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource )
TQMap<TQString,TQString> 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 );
}

2
klipper/historyurlitem.cpp
Unescape View File

@ -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

2
konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
Unescape View File

@ -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;
}

2
konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
Unescape View File

@ -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;
}

2
libkonq/konq_dirpart.cc
Unescape View File

@ -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 );

20
libkonq/konq_drag.cc
Unescape View File

@ -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

2
libkonq/konq_operations.cc
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save