summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /libkonq
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/knewmenu.cc10
-rw-r--r--libkonq/konq_bgnddlg.cc18
-rw-r--r--libkonq/konq_dirpart.cc8
-rw-r--r--libkonq/konq_drag.cc16
-rw-r--r--libkonq/konq_drag.h6
-rw-r--r--libkonq/konq_filetip.cc6
-rw-r--r--libkonq/konq_historymgr.cc10
-rw-r--r--libkonq/konq_historymgr.h2
-rw-r--r--libkonq/konq_iconviewwidget.cc38
-rw-r--r--libkonq/konq_operations.cc6
-rw-r--r--libkonq/konq_pixmapprovider.cc6
-rw-r--r--libkonq/konq_popupmenu.cc6
-rw-r--r--libkonq/konq_propsview.cc4
-rw-r--r--libkonq/konq_propsview.h2
-rw-r--r--libkonq/konq_settings.cc4
-rw-r--r--libkonq/konqbookmarkmanager.h2
16 files changed, 72 insertions, 72 deletions
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index d95490119..35f528318 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -41,7 +41,7 @@
#include <utime.h>
// For KURLDesktopFileDlg
-#include <layout.h>
+#include <tqlayout.h>
#include <tqhbox.h>
#include <klineedit.h>
#include <kurlrequester.h>
@@ -233,7 +233,7 @@ void KNewMenu::fillMenu()
if ( !bSkip )
{
- Entry entry = *(s_templatesList->at( i-1 ));
+ Entry entry = *(s_templatesList->tqat( i-1 ));
// The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
if ( (*templ).templatePath.endsWith( "emptydir" ) )
@@ -378,7 +378,7 @@ void KNewMenu::slotNewFile()
emit activated(); // for KDIconView::slotNewMenuActivated()
- Entry entry = *(s_templatesList->at( id - 1 ));
+ Entry entry = *(s_templatesList->tqat( id - 1 ));
//kdDebug(1203) << TQString("sFile = %1").arg(sFile) << endl;
if ( !TQFile::exists( entry.templatePath ) ) {
@@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
TQLabel * label = new TQLabel( textFileName, fileNameBox );
m_leFileName = new KLineEdit( fileNameBox, 0L );
- m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3);
+ m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3);
label->setBuddy(m_leFileName); // please "scheck" style
m_leFileName->setText( defaultName );
m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
@@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" );
m_urlRequester->setMode( KFile::File | KFile::Directory );
- m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
+ m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 );
connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotURLTextChanged(const TQString&)) );
label->setBuddy(m_urlRequester); // please "scheck" style
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index 5b0abc086..b025f3d4d 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -20,7 +20,7 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <kcolorbutton.h>
@@ -48,10 +48,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
- m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
- m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
- TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
- groupLayout->setAlignment( Qt::AlignTop );
+ m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() );
+ m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+ TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() );
+ groupLayout->tqsetAlignment( Qt::AlignTop );
mainLayout->addWidget( m_buttonGroup );
connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
@@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
groupLayout->addWidget( m_radioColor, 0, 0 );
m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup );
- m_buttonColor->setSizePolicy( TQSizePolicy::Preferred,
+ m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred,
TQSizePolicy::Minimum );
groupLayout->addWidget( m_buttonColor, 0, 1 );
@@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
TQLabel* lbl = new TQLabel( i18n("Preview"), page );
hlay->addWidget( lbl );
TQFrame* frame = new TQFrame( page );
- frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+ frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
frame->setFrameShape( TQFrame::HLine );
frame->setFrameShadow( TQFrame::Sunken );
hlay->addWidget( frame );
// preview frame
m_preview = new TQFrame( page );
- m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_preview->setMinimumSize( 370, 180 );
m_preview->setFrameShape( TQFrame::Panel );
m_preview->setFrameShadow( TQFrame::Raised );
@@ -142,7 +142,7 @@ void KonqBgndDialog::initPictures()
TQStringList::ConstIterator it;
for ( it = list.begin(); it != list.end(); it++ )
m_comboPicture->comboBox()->insertItem(
- ( (*it).at(0) == '/' ) ? // if absolute path
+ ( (*it).tqat(0) == '/' ) ? // if absolute path
KURL( *it ).fileName() : // then only fileName
*it );
}
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 7d88bc174..14a85fa30 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -39,7 +39,7 @@
#include <kglobalsettings.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqfile.h>
#include <tqguardedptr.h>
#include <assert.h>
@@ -133,7 +133,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
resetCount();
//m_bMultipleItemsSelected = false;
- connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
actionCollection()->setHighlightingEnabled( true );
@@ -301,7 +301,7 @@ void KonqDirPart::slotBackgroundSettings()
m_pProps->setBgPixmapFile( dlg->pixmapFile() );
}
m_pProps->applyColors( scrollWidget()->viewport() );
- scrollWidget()->viewport()->repaint();
+ scrollWidget()->viewport()->tqrepaint();
}
delete dlg;
@@ -418,7 +418,7 @@ void KonqDirPart::slotClipboardDataChanged()
// This is very related to KDIconView::slotClipboardDataChanged
KURL::List lst;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-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..4b97456f6 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cc
@@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const
else return 0;
}
-TQByteArray KonqIconDrag::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const
{
TQByteArray a;
TQCString mimetype( mime );
if ( mimetype == "application/x-qiconlist" )
- a = TQIconDrag::encodedData( mime );
+ a = TQIconDrag::tqencodedData( mime );
else if ( mimetype == "text/uri-list" ) {
TQCString s = urls.join( "\r\n" ).latin1();
if( urls.count() > 0 )
@@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const
return KonqIconDrag::format( i );
}
-TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const
{
TQCString mimetype( mime );
if ( mimetype == "application/x-kde-urilist" )
@@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
a[c] = 0;
return a;
}
- return KonqIconDrag::encodedData( mime );
+ return KonqIconDrag::tqencodedData( mime );
}
//
@@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const
else return 0;
}
-TQByteArray KonqDrag::encodedData( const char* mime ) const
+TQByteArray KonqDrag::tqencodedData( const char* mime ) const
{
TQByteArray a;
TQCString mimetype( mime );
@@ -243,7 +243,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const
}
else if ( mimetype == "application/x-kde-urilist" )
{
- return TQUriDrag::encodedData( "text/uri-list" );
+ return TQUriDrag::tqencodedData( "text/uri-list" );
}
else if ( mimetype == "application/x-kde-cutselection" )
{
@@ -271,13 +271,13 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const
bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e )
{
- TQByteArray a = e->encodedData( "application/x-kde-cutselection" );
+ TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" );
if ( a.isEmpty() )
return false;
else
{
kdDebug(1203) << "KonqDrag::decodeIsCutSelection : a=" << TQCString(a.data(), a.size() + 1) << endl;
- return (a.at(0) == '1'); // true if 1
+ return (a.tqat(0) == '1'); // true if 1
}
}
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index c30bbe49b..65a156021 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -44,7 +44,7 @@ public:
virtual ~KonqIconDrag() {}
const char* format( int i ) const;
- TQByteArray encodedData( const char* mime ) const;
+ TQByteArray tqencodedData( const char* mime ) const;
void append( const TQIconDragItem &item, const TQRect &pr,
const TQRect &tr, const TQString &url );
@@ -72,7 +72,7 @@ public:
virtual ~KonqIconDrag2() {}
virtual const char* format( int i ) const;
- virtual TQByteArray encodedData( const char* mime ) const;
+ virtual TQByteArray tqencodedData( const char* mime ) const;
void append( const TQIconDragItem &item, const TQRect &pr,
const TQRect &tr, const TQString &url, const KURL &mostLocalURL );
@@ -107,7 +107,7 @@ public:
virtual ~KonqDrag() {}
virtual const char* format( int i ) const;
- virtual TQByteArray encodedData( const char* mime ) const;
+ virtual TQByteArray tqencodedData( const char* mime ) const;
void setMoveSelection( bool move ) { m_bCutSelection = move; }
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index bb4ef6fd5..c7ef40c56 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqscrollview.h>
#include <tqtimer.h>
@@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent )
{
m_iconLabel = new TQLabel(this);
m_textLabel = new TQLabel(this);
- m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop);
+ m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
layout->addWidget(m_iconLabel, 0, 0);
@@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p )
}
if ( m_corners[m_corner].isNull())
- m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
+ m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
TQPixmap &pix = m_corners[m_corner];
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index 451b61ecf..9ac069cc5 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_history.setAutoDelete( true );
m_filename = locateLocal( "data",
- TQString::fromLatin1("konqueror/konq_history" ));
+ TQString::tqfromLatin1("konqueror/konq_history" ));
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
@@ -295,7 +295,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
// konqueror's window caption).
if ( !pending && u != title )
entry.title = title;
- entry.firstVisited = TQDateTime::currentDateTime();
+ entry.firstVisited = TQDateTime::tqcurrentDateTime();
entry.lastVisited = entry.firstVisited;
// always remove from pending if available, otherwise the else branch leaks
@@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url )
// Local URL -> add to history
KonqHistoryEntry entry;
entry.url = u;
- entry.firstVisited = TQDateTime::currentDateTime();
+ entry.firstVisited = TQDateTime::tqcurrentDateTime();
entry.lastVisited = entry.firstVisited;
emitAddToHistory( entry );
}
@@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString )
// compatibility fallback, try to load the old completion history
bool KonqHistoryManager::loadFallback()
{
- TQString file = locateLocal( "config", TQString::fromLatin1("konq_history"));
+ TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history"));
if ( file.isEmpty() )
return false;
@@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
entry->url = u;
entry->numberOfTimesVisited = weight;
// to make it not expire immediately...
- entry->lastVisited = TQDateTime::currentDateTime();
+ entry->lastVisited = TQDateTime::tqcurrentDateTime();
}
return entry;
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index 9545c5674..47c3d7b35 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -327,7 +327,7 @@ protected:
private slots:
/**
* Called by the updateTimer to emit the KParts::HistoryProvider::updated()
- * signal so that khtml can repaint the updated links.
+ * signal so that khtml can tqrepaint the updated links.
*/
void slotEmitUpdated();
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 64679ffa8..d881b6012 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -23,8 +23,8 @@
#include "konq_sound.h"
#include "konq_filetip.h"
-#include <clipboard.h>
-#include <layout.h>
+#include <tqclipboard.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqpainter.h>
#include <tqtooltip.h>
@@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
m_LineupMode = LineupBoth;
// emit our signals
slotSelectionChanged();
- m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" );
+ m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" );
KonqUndoManager::incRef();
}
@@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (!hasPixmap && backgroundMode() != NoBackground)
d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
- d->m_movie->connecStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
+ d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
d->movieFileName = d->pActiveItem->mouseOverAnimation();
d->pActiveItem->setAnimated( true );
}
@@ -331,7 +331,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
else // No change in current item
{
// No effect. If we want to underline on hover, we should
- // force the IVI to repaint here, though!
+ // force the IVI to tqrepaint here, though!
d->pActiveItem = 0L;
d->pFileTip->setItem( 0L );
}
@@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype())
&& KGlobalSettings::showFilePreview(item->item()->url())
- && topLevelWidget() == kapp->activeWindow())
+ && tqtopLevelWidget() == kapp->activeWindow())
{
d->pSoundItem = item;
d->bSoundItemClicked = false;
@@ -650,10 +650,10 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
// Disable repaints that can be triggered by ivi->setIcon(). Since icons are
// resized in-place, if the icon size is increasing it can happens that the right
- // or bottom icons exceed the size of the viewport.. here we prevent the repaint
+ // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint
// event that will be triggered in that case.
bool prevUpdatesState = viewport()->isUpdatesEnabled();
- viewport()->setUpdatesEnabled( false );
+ viewport()->tqsetUpdatesEnabled( false );
// Do this even if size didn't change, since this is used by refreshMimeTypes...
for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
@@ -673,11 +673,11 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
}
// Restore viewport update to previous state
- viewport()->setUpdatesEnabled( prevUpdatesState );
+ viewport()->tqsetUpdatesEnabled( prevUpdatesState );
if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() ||
!stopImagePreviewFor.isEmpty() ) && autoArrange() )
- arrangeItemsInGrid( true ); // take new grid into account and repaint
+ arrangeItemsInGrid( true ); // take new grid into account and tqrepaint
else
viewport()->update(); //Repaint later..
}
@@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
{
if ( e->provides( "text/uri-list" ) )
{
- TQByteArray payload = e->encodedData( "text/uri-list" );
+ TQByteArray payload = e->tqencodedData( "text/uri-list" );
if ( !payload.size() )
kdError() << "Empty data !" << endl;
// Cache the URLs, since we need them every time we move over a file
@@ -1147,14 +1147,14 @@ void KonqIconViewWidget::cutSelection()
kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
obj->setMoveSelection( true );
- TQApplication::clipboard()->setData( obj );
+ TQApplication::tqclipboard()->setData( obj );
}
void KonqIconViewWidget::copySelection()
{
kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
- TQApplication::clipboard()->setData( obj );
+ TQApplication::tqclipboard()->setData( obj );
}
void KonqIconViewWidget::pasteSelection()
@@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
// The following call is SO expensive (the ::widgetAt call eats up to 80%
// of the mouse move cpucycles!), so it's mandatory to place that function
// under strict checks, such as d->pSoundPlayer->isPlaying()
- if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() )
+ if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() )
{
if (d->pSoundPlayer)
d->pSoundPlayer->stop();
@@ -1249,7 +1249,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link)
&& ev->source() && ev->source() == viewport())
{
- // First we need to call TQIconView though, to clear the drag shape
+ // First we need to call TQIconView though, to clear the drag tqshape
bool bMovable = itemsMovable();
setItemsMovable(false); // hack ? call it what you want :-)
KIconView::contentsDropEvent( ev );
@@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
y = QMAX(y, i->y() + i->height());
}
- TQMemArray<TQRect> rects = r.rects();
+ TQMemArray<TQRect> rects = r.tqrects();
TQMemArray<TQRect>::Iterator it = rects.begin();
bool foundPlace = FALSE;
for (; it != rects.end(); ++it)
@@ -1730,12 +1730,12 @@ void KonqIconViewWidget::lineupIcons()
}
}
- // repaint
+ // tqrepaint
if ( newItemWidth )
updateContents();
else {
// Repaint only repaintRegion...
- TQMemArray<TQRect> rects = repaintRegion.rects();
+ TQMemArray<TQRect> rects = repaintRegion.tqrects();
for ( uint l = 0; l < rects.count(); l++ ) {
kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
<< rects[l].y() << ")\n";
@@ -1794,7 +1794,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
}
// Repaint only repaintRegion...
- TQMemArray<TQRect> rects = repaintRegion.rects();
+ TQMemArray<TQRect> rects = repaintRegion.tqrects();
for ( uint l = 0; l < rects.count(); l++ ) {
kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
<< rects[l].y() << ")\n";
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index f0357e4d0..fb803a9a9 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include "konq_operations.h"
#include <kautomount.h>
@@ -76,7 +76,7 @@ KonqOperations::~KonqOperations()
void KonqOperations::editMimeType( const TQString & mimeType )
{
- TQString keditfiletype = TQString::fromLatin1("keditfiletype");
+ TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
keditfiletype, keditfiletype /*unused*/);
}
@@ -124,7 +124,7 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1203) << "move (from clipboard data) = " << move << endl;
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index a23ea3ff6..fbb16cf72 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -70,9 +70,9 @@ TQString KonqPixmapProvider::iconNameFor( const TQString& url )
else
{
KURL u;
- if ( url.at(0) == '~' )
+ if ( url.tqat(0) == '~' )
u.setPath( KShell::tildeExpand( url ) );
- else if ( url.at(0) == '/' )
+ else if ( url.tqat(0) == '/' )
u.setPath( url );
else
u = url;
@@ -166,7 +166,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
return SmallIcon( icon, size );
KURL u;
- if ( url.at(0) == '/' )
+ if ( url.tqat(0) == '/' )
u.setPath( url );
else
u = url;
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index b878b0ae5..a7608c7f8 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -355,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_pluginList.setAutoDelete( true );
m_ownActions.setHighlightingEnabled( true );
- attrName = TQString::fromLatin1( "name" );
+ attrName = TQString::tqfromLatin1( "name" );
prepareXMLGUIStuff();
m_builder = new KonqPopupMenuGUIBuilder( this );
@@ -1157,7 +1157,7 @@ void KonqPopupMenu::addPlugins()
//search for a plugin with the right protocol
KTrader::OfferList plugin_offers;
unsigned int pluginCount = 0;
- plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
+ plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
if ( plugin_offers.isEmpty() )
return; // no plugins installed do not bother about it
@@ -1176,7 +1176,7 @@ void KonqPopupMenu::addPlugins()
if ( !plugin )
continue;
// This make the kuick plugin insert its stuff above "Properties"
- TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount );
+ TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount );
addMerge( pluginClientName );
plugin->domDocument().documentElement().setAttribute( "name", pluginClientName );
m_pluginList.append( plugin );
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index 303fe044f..b860183c6 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color )
const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const
{
if ( !m_bgColor.isValid() )
- return widget->colorGroup().base();
+ return widget->tqcolorGroup().base();
else
return m_bgColor;
}
@@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color )
const TQColor & KonqPropsView::textColor( TQWidget * widget ) const
{
if ( !m_textColor.isValid() )
- return widget->colorGroup().text();
+ return widget->tqcolorGroup().text();
else
return m_textColor;
}
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index c69b97966..c17f58a68 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -133,7 +133,7 @@ protected:
TQString currentGroup() const {
return isDefaultProperties() ?
- TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties");
+ TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties");
}
private:
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index d48c7af10..b9cf41503 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -146,10 +146,10 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
return true; //always embed mimetype inode/*, Browser/* and Konqueror/*
- TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup );
+ TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup );
if ( it != m_embedMap.end() ) {
kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl;
- return it.data() == TQString::fromLatin1("true");
+ return it.data() == TQString::tqfromLatin1("true");
}
// 3 - if no config found, use default.
// Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp !
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 9774d92e9..a45878562 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -11,7 +11,7 @@ public:
static KBookmarkManager * self() {
if ( !s_bookmarkManager )
{
- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+ TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;