summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/favicons/favicons.cpp8
-rw-r--r--libkonq/kivdirectoryoverlay.cpp4
-rw-r--r--libkonq/kivfreespaceoverlay.cpp2
-rw-r--r--libkonq/knewmenu.cpp34
-rw-r--r--libkonq/konq_bgnddlg.cpp16
-rw-r--r--libkonq/konq_dirpart.cpp68
-rw-r--r--libkonq/konq_filetip.cpp14
-rw-r--r--libkonq/konq_historymgr.cpp2
-rw-r--r--libkonq/konq_iconviewwidget.cpp36
-rw-r--r--libkonq/konq_operations.cpp32
-rw-r--r--libkonq/konq_popupmenu.cpp26
-rw-r--r--libkonq/konq_undo.cpp16
12 files changed, 129 insertions, 129 deletions
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index eab4a4479..c0d5a4f38 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -186,9 +186,9 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const
TDEIO::Job *job = TDEIO::get(iconURL, false, false);
job->addMetaData(d->metaData);
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
- connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
FaviconsModulePrivate::DownloadInfo download;
download.hostOrURL = hostOrURL;
download.isHost = isHost;
@@ -202,7 +202,7 @@ void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data)
if (oldSize > 0x10000)
{
d->killJobs.append(job);
- TQTimer::singleShot(0, this, TQT_SLOT(slotKill()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotKill()));
}
download.iconData.resize(oldSize + data.size());
memcpy(download.iconData.data() + oldSize, data.data(), data.size());
diff --git a/libkonq/kivdirectoryoverlay.cpp b/libkonq/kivdirectoryoverlay.cpp
index bb1b0d6c2..590747b9c 100644
--- a/libkonq/kivdirectoryoverlay.cpp
+++ b/libkonq/kivdirectoryoverlay.cpp
@@ -43,8 +43,8 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory)
{
m_lister = new KDirLister;
m_lister->setAutoErrorHandlingEnabled(false, 0);
- connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
- connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& )));
+ connect(m_lister, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
+ connect(m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(slotNewItems( const KFileItemList& )));
m_lister->setShowingDotFiles(false);
}
m_directory = directory;
diff --git a/libkonq/kivfreespaceoverlay.cpp b/libkonq/kivfreespaceoverlay.cpp
index 0343a4ab6..d0cd82e7d 100644
--- a/libkonq/kivfreespaceoverlay.cpp
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -63,7 +63,7 @@ void KIVFreeSpaceOverlay::start()
if ( !m_freespace->item()->isReadable() ) {
emit finished();
}
- TQTimer::singleShot(0, this, TQT_SLOT(slotDisplay()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotDisplay()));
}
void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *)
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 042bb4e92..4dc1070cb 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -238,7 +238,7 @@ void KNewMenu::fillMenu()
// The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
if ( (*templ).templatePath.endsWith( "emptydir" ) )
{
- TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ),
+ TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewDir() ),
d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
act->plug( popupMenu() );
@@ -248,7 +248,7 @@ void KNewMenu::fillMenu()
}
else
{
- TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ),
+ TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewFile() ),
d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
@@ -302,12 +302,12 @@ void KNewMenu::slotFillTemplates()
//kdDebug(1203) << "Templates resource dir: " << *it << endl;
s_pDirWatch->addDir( *it );
}
- connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
// Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story
}
s_templatesVersion++;
@@ -468,11 +468,11 @@ void KNewMenu::slotNewFile()
//kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest );
job->setDefaultPermissions( true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
if ( m_isURLDesktopFile )
- connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
- TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
+ connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
+ TQ_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
KURL::List lst;
lst.append( uSrc );
(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -549,8 +549,8 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
label->setBuddy(m_leFileName); // please "scheck" style
m_leFileName->setText( defaultName );
m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
- connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotNameTextChanged(const TQString&)) );
+ connect( m_leFileName, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotNameTextChanged(const TQString&)) );
// Second line: url
TQHBox * urlBox = new TQHBox( plainPage() );
@@ -560,13 +560,13 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
m_urlRequester->setMode( KFile::File | KFile::Directory );
m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
- connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotURLTextChanged(const TQString&)) );
+ connect( m_urlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotURLTextChanged(const TQString&)) );
label->setBuddy(m_urlRequester); // please "scheck" style
m_urlRequester->setFocus();
enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() );
- connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) );
m_fileNameEdited = false;
}
diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp
index f4c0c41a6..04a95f3b0 100644
--- a/libkonq/konq_bgnddlg.cpp
+++ b/libkonq/konq_bgnddlg.cpp
@@ -54,8 +54,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
groupLayout->setAlignment( TQt::AlignTop );
mainLayout->addWidget( m_buttonGroup );
- connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
- this, TQT_SLOT( slotBackgroundModeChanged() ) );
+ connect( m_buttonGroup, TQ_SIGNAL( clicked(int) ),
+ this, TQ_SLOT( slotBackgroundModeChanged() ) );
// color
m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
@@ -65,8 +65,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
TQSizePolicy::Minimum );
groupLayout->addWidget( m_buttonColor, 0, 1 );
- connect( m_buttonColor, TQT_SIGNAL( changed( const TQColor& ) ),
- this, TQT_SLOT( slotColorChanged() ) );
+ connect( m_buttonColor, TQ_SIGNAL( changed( const TQColor& ) ),
+ this, TQ_SLOT( slotColorChanged() ) );
// picture
m_radioPicture = new TQRadioButton( i18n("&Picture:"), m_buttonGroup );
@@ -75,10 +75,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 );
initPictures();
- connect( m_comboPicture->comboBox(), TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotPictureChanged() ) );
- connect( m_comboPicture, TQT_SIGNAL( urlSelected(const TQString &) ),
- this, TQT_SLOT( slotPictureChanged() ) );
+ connect( m_comboPicture->comboBox(), TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotPictureChanged() ) );
+ connect( m_comboPicture, TQ_SIGNAL( urlSelected(const TQString &) ),
+ this, TQ_SLOT( slotPictureChanged() ) );
TQSpacerItem* spacer1 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding,
TQSizePolicy::Minimum );
diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp
index 32e6acb7c..c4d90d5b7 100644
--- a/libkonq/konq_dirpart.cpp
+++ b/libkonq/konq_dirpart.cpp
@@ -133,12 +133,12 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
resetCount();
//m_bMultipleItemsSelected = false;
- connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
actionCollection()->setHighlightingEnabled( true );
- m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
- m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
+ m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQ_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
+ m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQ_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" );
d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0,
@@ -158,17 +158,17 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
d->aSmallMediumIcons->setExclusiveGroup( "ViewMode" );
m_paSmallIcons->setExclusiveGroup( "ViewMode" );
- connect( m_paDefaultIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( d->aEnormousIcons, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paHugeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paLargeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paMediumIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( d->aSmallMediumIcons, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paSmallIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-
- connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
+ connect( m_paDefaultIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( d->aEnormousIcons, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paHugeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paLargeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paMediumIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( d->aSmallMediumIcons, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+
+ connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
#if 0
// Extract 6 icon sizes from the icon theme.
// Use 16,22,32,48,64,128 as default.
@@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
m_iIconSize[4] = TDEIcon::SizeHuge;
// ... up to here
- TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ),
+ TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQ_SLOT( slotBackgroundSettings() ),
actionCollection(), "bgsettings" );
a->setToolTip( i18n( "Allows choosing of background settings for this view" ) );
@@ -665,25 +665,25 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part )
{
assert(part);
m_findPart = part;
- connect( m_findPart, TQT_SIGNAL( started() ),
- this, TQT_SLOT( slotStarted() ) );
- connect( m_findPart, TQT_SIGNAL( started() ),
- this, TQT_SLOT( slotStartAnimationSearching() ) );
- connect( m_findPart, TQT_SIGNAL( clear() ),
- this, TQT_SLOT( slotClear() ) );
- connect( m_findPart, TQT_SIGNAL( newItems( const KFileItemList & ) ),
- this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_findPart, TQT_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
- this, TQT_SLOT( slotCompleted() ) );
- connect( m_findPart, TQT_SIGNAL( finished() ),
- this, TQT_SLOT( slotStopAnimationSearching() ) );
- connect( m_findPart, TQT_SIGNAL( canceled() ),
- this, TQT_SLOT( slotCanceled() ) );
- connect( m_findPart, TQT_SIGNAL( canceled() ),
- this, TQT_SLOT( slotStopAnimationSearching() ) );
-
- connect( m_findPart, TQT_SIGNAL( findClosed() ),
- this, TQT_SLOT( slotFindClosed() ) );
+ connect( m_findPart, TQ_SIGNAL( started() ),
+ this, TQ_SLOT( slotStarted() ) );
+ connect( m_findPart, TQ_SIGNAL( started() ),
+ this, TQ_SLOT( slotStartAnimationSearching() ) );
+ connect( m_findPart, TQ_SIGNAL( clear() ),
+ this, TQ_SLOT( slotClear() ) );
+ connect( m_findPart, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_findPart, TQ_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
+ this, TQ_SLOT( slotCompleted() ) );
+ connect( m_findPart, TQ_SIGNAL( finished() ),
+ this, TQ_SLOT( slotStopAnimationSearching() ) );
+ connect( m_findPart, TQ_SIGNAL( canceled() ),
+ this, TQ_SLOT( slotCanceled() ) );
+ connect( m_findPart, TQ_SIGNAL( canceled() ),
+ this, TQ_SLOT( slotStopAnimationSearching() ) );
+
+ connect( m_findPart, TQ_SIGNAL( findClosed() ),
+ this, TQ_SLOT( slotFindClosed() ) );
emit findOpened( this );
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index 8ad1e0d6f..5bc3de86b 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -114,7 +114,7 @@ void KonqFileTip::setItem( KFileItem *item, const TQRect &rect, const TQPixmap *
// Don't start immediately, because the user could move the mouse over another item
// This avoids a quick sequence of started preview-jobs
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed()));
m_timer->start( 300, true );
}
}
@@ -234,7 +234,7 @@ void KonqFileTip::showTip()
if ( text.isEmpty() ) return;
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip()));
m_timer->start( 15000, true );
m_textLabel->setText( text );
@@ -261,14 +261,14 @@ void KonqFileTip::startDelayed()
oneItem.append( m_item );
m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
- connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
- this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
- connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( gotPreviewResult() ) );
+ connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+ this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
+ connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( gotPreviewResult() ) );
}
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip()));
m_timer->start( 400, true );
}
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index 25cfef345..ac6916c81 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -61,7 +61,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
// and load the history
loadHistory();
- connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotEmitUpdated() ));
+ connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotEmitUpdated() ));
}
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 3f785604e..09ed599fd 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -121,17 +121,17 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
{
d = new KonqIconViewWidgetPrivate;
- connect( this, TQT_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
- this, TQT_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
+ connect( this, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+ this, TQ_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
- connect( this, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( slotSelectionChanged() ) );
+ connect( this, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( slotSelectionChanged() ) );
kapp->addKipcEventMask( KIPC::IconChanged );
- connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
- connect( this, TQT_SIGNAL(onItem(TQIconViewItem *)), TQT_SLOT(slotOnItem(TQIconViewItem *)) );
- connect( this, TQT_SIGNAL(onViewport()), TQT_SLOT(slotOnViewport()) );
- connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+ connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+ connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) );
+ connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) );
+ connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
m_pSettings = KonqFMSettings::settings(); // already needed in setItemTextPos(), calculateGridX()
d->bBoostPreview = boostPreview();
@@ -284,7 +284,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
else {
kdDebug(1203) << "we go ahead.." << endl;
d->m_movieBlocked++;
- TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+ TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
d->m_movie->restart();
d->m_movie->unpause();
}
@@ -307,8 +307,8 @@ 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->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) );
+ d->m_movie->connectUpdate( this, TQ_SLOT( slotMovieUpdate(const TQRect &) ) );
+ d->m_movie->connectStatus( this, TQ_SLOT( slotMovieStatus(int) ) );
d->movieFileName = d->pActiveItem->mouseOverAnimation();
d->pActiveItem->setAnimated( true );
}
@@ -356,7 +356,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (!d->pSoundTimer)
{
d->pSoundTimer = new TQTimer(this);
- connect(d->pSoundTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartSoundPreview()));
+ connect(d->pSoundTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartSoundPreview()));
}
if (d->pSoundTimer->isActive())
d->pSoundTimer->stop();
@@ -394,7 +394,7 @@ void KonqIconViewWidget::slotOnViewport()
d->m_movie->pause();
d->m_movieBlocked++;
kdDebug(1203) << "on viewport, blocking" << endl;
- TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+ TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
}
#endif
d->pActiveItem->refreshIcon( true );
@@ -874,10 +874,10 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize,
m_pSettings->textPreviewIconTransparency(), true /* scale */,
true /* save */, &(d->previewSettings) );
- connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
- this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
- connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotPreviewResult() ) );
+ connect( d->pPreviewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+ this, TQ_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
+ connect( d->pPreviewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotPreviewResult() ) );
}
void KonqIconViewWidget::stopImagePreview()
@@ -1386,7 +1386,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
if (!d->pActivateDoubleClick)
{
d->pActivateDoubleClick = new TQTimer(this);
- connect(d->pActivateDoubleClick, TQT_SIGNAL(timeout()), this, TQT_SLOT(doubleClickTimeout()));
+ connect(d->pActivateDoubleClick, TQ_SIGNAL(timeout()), this, TQ_SLOT(doubleClickTimeout()));
}
if( d->pActivateDoubleClick->isActive () )
d->pActivateDoubleClick->stop();
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 0761fe246..0897cc2c1 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -221,8 +221,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
delete this;
return;
}
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
} else
delete this;
}
@@ -231,8 +231,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls )
{
m_method = RESTORE;
KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget )
@@ -376,7 +376,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr
else
{
// we need to stat to get it.
- op->_statURL( dest, op, TQT_SLOT( asyncDrop( const KFileItem * ) ) );
+ op->_statURL( dest, op, TQ_SLOT( asyncDrop( const KFileItem * ) ) );
}
// In both cases asyncDrop will delete op when done
@@ -458,7 +458,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
bool ro = desktopFile.readBoolEntry( "ReadOnly", false );
TQString fstype = desktopFile.readEntry( "FSType" );
KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destURL.path(), false );
- connect( am, TQT_SIGNAL( finished() ), this, TQT_SLOT( doFileCopy() ) );
+ connect( am, TQ_SIGNAL( finished() ), this, TQ_SLOT( doFileCopy() ) );
}
return;
}
@@ -658,16 +658,16 @@ void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::Lis
m_destURL = dest;
if ( job )
{
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
TDEIO::CopyJob *copyJob = dynamic_cast<TDEIO::CopyJob*>(job);
KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
if (copyJob && iconView)
{
- connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
- this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
- connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
- iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
+ connect(copyJob, TQ_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
+ this, TQ_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
+ connect(this, TQ_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
+ iconView, TQ_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
}
}
else // for link
@@ -688,10 +688,10 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const
void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member )
{
- connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
+ connect( this, TQ_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
}
void KonqOperations::slotStatResult( TDEIO::Job * job )
@@ -763,7 +763,7 @@ KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgr
m_urls( urls ), m_urlsIterator( m_urls.begin() ),
m_progress( 0 )
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
}
void KonqMultiRestoreJob::slotStart()
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index 4c90b651a..1728e83f4 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
name.setNum( id );
name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0,
- this, TQT_SLOT( slotRunService() ),
+ this, TQ_SLOT( slotRunService() ),
&m_ownActions, name );
if ( !(*it).m_strIcon.isEmpty() )
@@ -430,8 +430,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
d->localURLSlotFired = false;
TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL);
if (localURLJob) {
- connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
- connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
+ connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
+ connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
while (!d->localURLSlotFired) {
kapp->eventLoop()->enterLoop();
}
@@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( ((kpf & ShowNewWindow) != 0) && sReading && !isEncryptedMediaFile)
{
TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
- TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+ TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQ_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
actNewWindow->setToolTip( i18n( "Open item in a new window" ) );
addAction( actNewWindow );
addSeparator();
@@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
{
- TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+ TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQ_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
addAction( actNewDir );
addSeparator();
}
}
} else if ( isIntoTrash ) {
// Trashed item, offer restoring
- act = new TDEAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+ act = new TDEAction( i18n( "&Restore" ), 0, this, TQ_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
addAction( act );
}
@@ -598,7 +598,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
if ( isCurrentTrash )
{
- act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+ act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
KSimpleConfig trashConfig( "trashrc", true );
trashConfig.setGroup( "Status" );
act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
@@ -631,7 +631,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
else
caption = i18n("&Bookmark This File");
- act = new TDEAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+ act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
if (m_lstItems.count() > 1)
act->setEnabled(false);
if (kapp->authorizeTDEAction("bookmarks"))
@@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
actionName = i18n( "Open with %1" ).arg( actionName );
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
- this, TQT_SLOT( slotRunService() ),
+ this, TQ_SLOT( slotRunService() ),
&m_ownActions, nam.prepend( "appservice_" ) );
addAction( act, menu );
@@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
openWithActionName = i18n( "&Open With..." );
}
- TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( openWithAct, menu );
}
else // no app offers -> Open With...
{
- act = new TDEAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ act = new TDEAction( i18n( "&Open With..." ), 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( act );
}
@@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
{
- act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQT_SLOT( slotPopupProperties() ),
+ act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ),
&m_ownActions, "properties" );
addAction( act );
}
@@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KFileShare::authorization() == KFileShare::Authorized )
{
addSeparator();
- act = new TDEAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ),
+ act = new TDEAction( i18n("Share"), 0, this, TQ_SLOT( slotOpenShareFileDialog() ),
&m_ownActions, "sharefile" );
addAction( act );
}
diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp
index 51d85587d..9272bbf5c 100644
--- a/libkonq/konq_undo.cpp
+++ b/libkonq/konq_undo.cpp
@@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List
d->m_cmd.m_valid = true;
d->m_cmd.m_src = src;
d->m_cmd.m_dst = dst;
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
if ( op != KonqCommand::MKDIR ) {
- connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
- this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
- connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
- this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
+ connect( job, TQ_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
+ this, TQ_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
+ connect( job, TQ_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
+ this, TQ_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
}
KonqUndoManager::incRef();
@@ -411,8 +411,8 @@ void KonqUndoManager::undoStep()
undoRemovingDirectories();
if ( d->m_currentJob )
- connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( d->m_currentJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
void KonqUndoManager::undoMakingDirectories()