summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /libkonq
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz
tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/kivdirectoryoverlay.h3
-rw-r--r--libkonq/knewmenu.cc4
-rw-r--r--libkonq/konq_bgnddlg.cc8
-rw-r--r--libkonq/konq_drag.cc2
-rw-r--r--libkonq/konq_iconviewwidget.cc4
-rw-r--r--libkonq/konq_operations.cc6
-rw-r--r--libkonq/konq_pixmapprovider.cc6
7 files changed, 17 insertions, 16 deletions
diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 27fba34d9..c6fbbc43f 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -28,9 +28,10 @@
class KDirLister;
class KFileIVI;
-class LIBKONQ_EXPORT KIVDirectoryOverlay : public QObject
+class LIBKONQ_EXPORT KIVDirectoryOverlay : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KIVDirectoryOverlay(KFileIVI* directory);
virtual ~KIVDirectoryOverlay();
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index cc05df41d..5e41ef571 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -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 ) ) {
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index b1ebdc92f..b025f3d4d 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -48,9 +48,9 @@ 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() );
+ 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 );
@@ -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_drag.cc b/libkonq/konq_drag.cc
index 07a3e8bda..4b97456f6 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cc
@@ -277,7 +277,7 @@ bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e )
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_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 152083895..2c32b5778 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -653,7 +653,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
// 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,7 +673,7 @@ 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() )
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 616404ee5..99afde5dd 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -541,7 +541,7 @@ void KonqOperations::doFileCopy()
linkOnly )
{
// Neither control nor shift are pressed => show popup menu
- KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
+ KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
bool bSetWallpaper = false;
if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 )
{
@@ -658,8 +658,8 @@ void KonqOperations::setOperation( KIO::Job * job, int method, const KURL::List
{
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::CopyJob *copyJob = dynamic_cast<KIO::CopyJob*>(job);
- KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
+ KIO::CopyJob *copyJob = tqt_dynamic_cast<KIO::CopyJob*>(job);
+ KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
if (copyJob && iconView)
{
connect(copyJob, TQT_SIGNAL(aboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)),
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index 932b1b7d0..cb42ae481 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;