summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
Diffstat (limited to 'kio')
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc4
-rw-r--r--kio/kfile/kicondialog.cpp6
-rw-r--r--kio/kfile/kopenwith.cpp4
-rw-r--r--kio/kfile/kpropertiesdialog.cpp30
-rw-r--r--kio/kio/dataprotocol.cpp2
-rw-r--r--kio/kio/krun.cpp4
-rw-r--r--kio/kio/paste.cpp14
-rw-r--r--kio/kio/pastedialog.cpp2
-rw-r--r--kio/misc/kntlm/kntlm.cpp34
-rw-r--r--kio/misc/kntlm/kntlm.h4
-rw-r--r--kio/misc/kpac/script.cpp2
11 files changed, 53 insertions, 53 deletions
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index 0c7965a16..20ce42a86 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -403,9 +403,9 @@ void RMB::slotRMBActionCopyLocation( int val )
if ( !bookmark.isGroup() )
{
- kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection );
- kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard );
}
}
diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
index ef64de4cc..3d0b6be8f 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/kio/kfile/kicondialog.cpp
@@ -268,11 +268,11 @@ void KIconDialog::init()
top->setSpacing( spacingHint() );
TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main);
- bgroup->tqlayout()->setSpacing(KDialog::spacingHint());
- bgroup->tqlayout()->setMargin(KDialog::marginHint());
+ bgroup->layout()->setSpacing(KDialog::spacingHint());
+ bgroup->layout()->setMargin(KDialog::marginHint());
top->addWidget(bgroup);
connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int)));
- TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2);
+ TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2);
mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup);
grid->addWidget(mpRb1, 1, 0);
mpCombo = new TQComboBox(bgroup);
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 30b7d161e..2a3e7e690 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KApplicationTree::resizeEvent( TQResizeEvent * e)
{
- setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent)
- -2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
+ setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
+ -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
KListView::resizeEvent(e);
}
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 2f80b07e2..ac485eb93 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ )
{
KIconButton *iconButton = new KIconButton( d->m_frame );
- int bsize = 66 + 2 * iconButton->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin);
iconButton->setFixedSize(bsize, bsize);
iconButton->setIconSize(48);
iconButton->setStrictIconSize(false);
@@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
this, TQT_SLOT( slotIconChanged() ) );
} else {
TQLabel *iconLabel = new TQLabel( d->m_frame );
- int bsize = 66 + 2 * iconLabel->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin);
iconLabel->setFixedSize(bsize, bsize);
iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) );
iconArea = iconLabel;
@@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
/* Group: Access Permissions */
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame );
- gb->tqlayout()->setSpacing(KDialog::spacingHint());
- gb->tqlayout()->setMargin(KDialog::marginHint());
+ gb->layout()->setSpacing(KDialog::spacingHint());
+ gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb);
- gl = new TQGridLayout (gb->tqlayout(), 7, 2);
+ gl = new TQGridLayout (gb->layout(), 7, 2);
gl->setColStretch(1, 1);
l = d->explanationLabel = new TQLabel( "", gb );
@@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
/**** Group: Ownership ****/
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame );
- gb->tqlayout()->setSpacing(KDialog::spacingHint());
- gb->tqlayout()->setMargin(KDialog::marginHint());
+ gb->layout()->setSpacing(KDialog::spacingHint());
+ gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb);
- gl = new TQGridLayout (gb->tqlayout(), 4, 3);
+ gl = new TQGridLayout (gb->layout(), 4, 3);
gl->addRowSpacing(0, 10);
/*** Set Owner ***/
@@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
// Group: Access Permissions
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox );
- gb->tqlayout()->setSpacing(KDialog::spacingHint());
- gb->tqlayout()->setMargin(KDialog::marginHint());
+ gb->layout()->setSpacing(KDialog::spacingHint());
+ gb->layout()->setMargin(KDialog::marginHint());
- gl = new TQGridLayout (gb->tqlayout(), 6, 6);
+ gl = new TQGridLayout (gb->layout(), 6, 6);
gl->addRowSpacing(0, 10);
TQValueVector<TQWidget*> theNotSpecials;
@@ -2916,7 +2916,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
layout->addMultiCellWidget(sep, 6, 6, 0, 1);
unmounted = new KIconButton( d->m_frame );
- int bsize = 66 + 2 * unmounted->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin);
unmounted->setFixedSize(bsize, bsize);
unmounted->setIconType(KIcon::Desktop, KIcon::Device);
layout->addWidget(unmounted, 7, 0);
@@ -3635,7 +3635,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
mainlayout->addWidget(tmpQGroupBox);
- TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
+ TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
grid->setSpacing( KDialog::spacingHint() );
grid->setColStretch(1, 1);
@@ -3662,7 +3662,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
mainlayout->addWidget(tmpQGroupBox);
- grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2);
+ grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2);
grid->setSpacing( KDialog::spacingHint() );
grid->setColStretch(1, 1);
@@ -3701,7 +3701,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
mainlayout->addWidget(tmpQGroupBox);
- grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
+ grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
grid->setSpacing(KDialog::spacingHint());
grid->setColStretch(1, 1);
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index d3ef79ff3..161c82296 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -121,7 +121,7 @@ inline TQString extract(const TQString &buf, int &pos, TQChar c1,
TQChar c2 = '\0', TQChar c3 = '\0') {
int oldpos = pos;
pos = find(buf,oldpos,c1,c2,c3);
- return TQString(buf.tqunicode() + oldpos, pos - oldpos);
+ return TQString(buf.unicode() + oldpos, pos - oldpos);
}
/** ignores all whitespaces
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 2f488bc70..f09fccfa4 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -388,13 +388,13 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
if (!re.search( exec )) {
exec = TQString(re.cap( 1 )).stripWhiteSpace();
for (uint pos = 0; pos < exec.length(); ) {
- TQChar c = exec.tqunicode()[pos];
+ TQChar c = exec.unicode()[pos];
if (c != '\'' && c != '"')
goto synerr; // what else can we do? after normal parsing the substs would be insecure
int pos2 = exec.find( c, pos + 1 ) - 1;
if (pos2 < 0)
goto synerr; // quoting error
- memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar));
+ memcpy( (void *)(exec.unicode() + pos), exec.unicode() + pos + 1, (pos2 - pos) * sizeof(TQChar));
pos = pos2;
exec.remove( pos, 2 );
}
diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index 99714ffa7..f39aa0746 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -135,7 +135,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
// if "data" came from TQClipboard, then it was deleted already - by a nice 0-seconds timer
// In that case, get it again. Let's hope the user didn't copy something else meanwhile :/
if ( clipboard ) {
- data = TQApplication::tqclipboard()->data();
+ data = TQApplication::clipboard()->data();
}
const TQByteArray ba = data->encodedData( chosenFormat );
return pasteDataAsyncTo( new_url, ba );
@@ -146,13 +146,13 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
KIO_EXPORT bool KIO::isClipboardEmpty()
{
#ifndef QT_NO_MIMECLIPBOARD
- TQMimeSource *data = TQApplication::tqclipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 )
return false;
#else
// Happens with some versions of Qt Embedded... :/
// Guess.
- TQString data = TQApplication::tqclipboard()->text();
+ TQString data = TQApplication::clipboard()->text();
if(data.contains("://"))
return false;
#endif
@@ -215,7 +215,7 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
}
#ifndef QT_NO_MIMECLIPBOARD
- TQMimeSource *data = TQApplication::tqclipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
// First check for URLs.
KURL::List urls;
@@ -233,14 +233,14 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
// If moving, erase the clipboard contents, the original files don't exist anymore
if ( move )
- TQApplication::tqclipboard()->clear();
+ TQApplication::clipboard()->clear();
return res;
}
return pasteMimeSource( data, dest_url, TQString::null, 0 /*TODO parent widget*/, true /*clipboard*/ );
#else
TQByteArray ba;
TQTextStream txtStream( ba, IO_WriteOnly );
- TQStringList data = TQStringList::split("\n", TQApplication::tqclipboard()->text());
+ TQStringList data = TQStringList::split("\n", TQApplication::clipboard()->text());
KURL::List urls;
KURLDrag::decode(data, urls);
TQStringList::Iterator end(data.end());
@@ -290,7 +290,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray&
KIO_EXPORT TQString KIO::pasteActionText()
{
- TQMimeSource *data = TQApplication::tqclipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
KURL::List urls;
if ( KURLDrag::canDecode( data ) && KURLDrag::decode( data, urls ) ) {
if ( urls.isEmpty() )
diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp
index f698d2de3..480eaaba8 100644
--- a/kio/kio/pastedialog.cpp
+++ b/kio/kio/pastedialog.cpp
@@ -62,7 +62,7 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
m_clipboardChanged = false;
if ( clipboard )
- connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( slotClipboardDataChanged() ) );
}
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index 834d2e30d..9af382483 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -32,7 +32,7 @@
#include "des.h"
#include "kntlm.h"
-TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode )
+TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
{
//watch for buffer overflows
TQ_UINT32 offset;
@@ -45,7 +45,7 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
TQString str;
const char *c = buf.data() + offset;
- if ( tqunicode ) {
+ if ( unicode ) {
str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
} else {
str = TQString::fromLatin1( c, len );
@@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
return ret;
}
-void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode )
+void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode )
{
TQByteArray tmp;
- if ( tqunicode ) {
+ if ( unicode ) {
tmp = QString2UnicodeLE( str );
addBuf( buf, secbuf, tmp );
} else {
@@ -126,15 +126,15 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
Challenge *ch = (Challenge *) challenge.data();
TQByteArray response;
uint chsize = challenge.size();
- bool tqunicode = false;
+ bool unicode = false;
TQString dom;
//challenge structure too small
if ( chsize < 32 ) return false;
- tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
+ unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
if ( domain.isEmpty() )
- dom = getString( challenge, ch->targetName, tqunicode );
+ dom = getString( challenge, ch->targetName, unicode );
else
dom = domain;
@@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response );
// }
if ( !dom.isEmpty() )
- addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode );
- addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode );
+ addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode );
+ addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode );
if ( !workstation.isEmpty() )
- addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode );
+ addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode );
auth = rbuf;
@@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha
TQByteArray KNTLM::ntlmHash( const TQString &password )
{
KMD4::Digest digest;
- TQByteArray ret, tqunicode;
- tqunicode = QString2UnicodeLE( password );
+ TQByteArray ret, unicode;
+ unicode = QString2UnicodeLE( password );
- KMD4 md4( tqunicode );
+ KMD4 md4( unicode );
md4.rawDigest( digest );
ret.duplicate( (const char*) digest, sizeof( digest ) );
return ret;
@@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks )
TQByteArray KNTLM::QString2UnicodeLE( const TQString &target )
{
- TQByteArray tqunicode( target.length() * 2 );
+ TQByteArray unicode( target.length() * 2 );
for ( uint i = 0; i < target.length(); i++ ) {
- ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() );
+ ((TQ_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() );
}
- return tqunicode;
+ return unicode;
}
TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len )
{
TQString ret;
for ( uint i = 0; i < len; i++ ) {
- ret += KFromToLittleEndian( data[ i ].tqunicode() );
+ ret += KFromToLittleEndian( data[ i ].unicode() );
}
return ret;
}
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 2be0a00af..462624fcd 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -212,7 +212,7 @@ public:
/**
* Extracts a string field from an NTLM structure.
*/
- static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
+ static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
/**
* Extracts a byte array from an NTLM structure.
*/
@@ -226,7 +226,7 @@ private:
static TQString UnicodeLE2TQString( const TQChar* data, uint len );
static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
- static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
+ static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
static void convertKey( unsigned char *key_56, void* ks );
};
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index 243f5f9c2..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -49,7 +49,7 @@ TQString UString::qstring() const
UString::UString( const TQString &s )
{
UChar* data = new UChar[ s.length() ];
- std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) );
+ std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) );
rep = Rep::create( data, s.length() );
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 17:45:37 +0000