summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/kfileivi.cc2
-rw-r--r--libkonq/kfileivi.h4
-rw-r--r--libkonq/knewmenu.cc16
-rw-r--r--libkonq/knewmenu.h2
-rw-r--r--libkonq/konq_iconviewwidget.cc2
-rw-r--r--libkonq/konq_operations.cc6
-rw-r--r--libkonq/konq_operations.h2
-rw-r--r--libkonq/konq_popupmenu.cc26
-rw-r--r--libkonq/konq_popupmenu.h10
9 files changed, 35 insertions, 35 deletions
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc
index 48f6d8bb6..3bc303bae 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/kfileivi.cc
@@ -81,7 +81,7 @@ KFileIVI::~KFileIVI()
delete d;
}
-void KFileIVI::tqinvalidateThumb( int state, bool redraw )
+void KFileIVI::invalidateThumb( int state, bool redraw )
{
TQIconSet::Mode mode;
switch( state )
diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h
index 1b2a3402e..6c16907ec 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/kfileivi.h
@@ -88,14 +88,14 @@ public:
bool redraw=false);
/**
- * Notifies that all icon effects on thumbs should be tqinvalidated,
+ * Notifies that all icon effects on thumbs should be invalidated,
* e.g. because the effect settings have been changed. The thumb itself
* is assumed to be still valid (use setThumbnailPixmap() instead
* otherwise).
* @param state the state of the icon (enum in KIcon)
* @param redraw whether to redraw the item after setting the icon
*/
- void tqinvalidateThumb( int state, bool redraw = false );
+ void invalidateThumb( int state, bool redraw = false );
/**
* Our current thumbnail is not longer "current".
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 5e41ef571..e307b0ddf 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L;
class KNewMenu::KNewMenuPrivate
{
public:
- KNewMenuPrivate() : m_tqparentWidget(0) {}
+ KNewMenuPrivate() : m_parentWidget(0) {}
KActionCollection * m_actionCollection;
TQString m_destPath;
- TQWidget *m_tqparentWidget;
+ TQWidget *m_parentWidget;
KActionMenu *m_menuDev;
};
@@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) :
makeMenus();
}
-KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name ) :
+KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) :
KActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
menuItemsVersion( 0 )
{
d = new KNewMenuPrivate;
d->m_actionCollection = _collec;
- d->m_tqparentWidget = tqparentWidget;
+ d->m_parentWidget = parentWidget;
makeMenus();
}
@@ -363,7 +363,7 @@ void KNewMenu::slotNewDir()
if (popupFiles.isEmpty())
return;
- KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first());
+ KonqOperations::newDir(d->m_parentWidget, popupFiles.first());
}
void KNewMenu::slotNewFile()
@@ -396,7 +396,7 @@ void KNewMenu::slotNewFile()
{
m_isURLDesktopFile = true;
// entry.comment contains i18n("Enter link to location (URL):"). JFYI :)
- KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_tqparentWidget );
+ KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_parentWidget );
// TODO dlg.setCaption( i18n( ... ) );
if ( dlg.exec() )
{
@@ -428,7 +428,7 @@ void KNewMenu::slotNewFile()
KURL templateURL;
templateURL.setPath( entry.templatePath );
- (void) new KPropertiesDialog( templateURL, *it, text, d->m_tqparentWidget );
+ (void) new KPropertiesDialog( templateURL, *it, text, d->m_parentWidget );
}
return; // done, exit.
}
@@ -447,7 +447,7 @@ void KNewMenu::slotNewFile()
text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
name = KInputDialog::getText( TQString::null, entry.comment,
- text, &ok, d->m_tqparentWidget );
+ text, &ok, d->m_parentWidget );
if ( !ok )
return;
}
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index 3c1b0a78b..6935ae7a4 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -58,7 +58,7 @@ public:
* Constructor
*/
KNewMenu( KActionCollection * _collec, const char *name=0L );
- KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name=0L );
+ KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L );
virtual ~KNewMenu();
/**
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 6ab540761..07cf1cfb7 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
ivi->setIcon( size, ivi->state(), true, false );
}
else
- ivi->tqinvalidateThumb( ivi->state(), true );
+ ivi->invalidateThumb( ivi->state(), true );
}
// Restore viewport update to previous state
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 99afde5dd..fb803a9a9 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
return;
}
- if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) )
+ if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) )
{
//m_srcURLs = selectedURLs;
KIO::Job *job;
@@ -525,7 +525,7 @@ void KonqOperations::doFileCopy()
}
m_method = TRASH;
- if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) )
+ if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) )
action = TQDropEvent::Move;
else
{
@@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job )
slotStart();
}
-TQWidget* KonqOperations::tqparentWidget() const
+TQWidget* KonqOperations::parentWidget() const
{
return static_cast<TQWidget *>( parent() );
}
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index fa47b4abe..66e04ee0d 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -173,7 +173,7 @@ protected:
void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; }
private:
- TQWidget* tqparentWidget() const;
+ TQWidget* parentWidget() const;
protected slots:
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 273ce8cfc..c828c4aa8 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -96,12 +96,12 @@ public:
class KonqPopupMenu::KonqPopupMenuPrivate
{
public:
- KonqPopupMenuPrivate() : m_tqparentWidget( 0 ),
+ KonqPopupMenuPrivate() : m_parentWidget( 0 ),
m_itemFlags( KParts::BrowserExtension::DefaultPopupItems )
{
}
TQString m_urlTitle;
- TQWidget *m_tqparentWidget;
+ TQWidget *m_parentWidget;
KParts::BrowserExtension::PopupFlags m_itemFlags;
};
@@ -200,30 +200,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
bool showProperties )
- : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow;
- init(tqparentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
+ init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
}
KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags flags)
- : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
- init(tqparentWidget, kpf, flags);
+ init(parentWidget, kpf, flags);
}
-void KonqPopupMenu::init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
+void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
{
d = new KonqPopupMenuPrivate;
- d->m_tqparentWidget = tqparentWidget;
+ d->m_parentWidget = parentWidget;
d->m_itemFlags = flags;
setup(kpf);
}
@@ -1035,7 +1035,7 @@ void KonqPopupMenu::slotPopupNewDir()
if (m_lstPopupURLs.empty())
return;
- KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first());
+ KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first());
}
void KonqPopupMenu::slotPopupEmptyTrashBin()
@@ -1116,10 +1116,10 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
if (item->entry().count() == 0) // this item wasn't listed by a slave
{
// KPropertiesDialog will use stat to get more info on the file
- return new KPropertiesDialog( item->url(), d->m_tqparentWidget );
+ return new KPropertiesDialog( item->url(), d->m_parentWidget );
}
}
- return new KPropertiesDialog( m_lstItems, d->m_tqparentWidget );
+ return new KPropertiesDialog( m_lstItems, d->m_parentWidget );
}
KAction *KonqPopupMenu::action( const TQDomElement &element ) const
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 15dbcef5e..e64a721d7 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -69,7 +69,7 @@ public:
// WARNING: bitfield. Next item is 8
/**
- * @deprecated lacks tqparentWidget pointer, and
+ * @deprecated lacks parentWidget pointer, and
* uses bool instead of KonqPopupFlags enum,
* might do strange things with the 'new window' action.
*/
@@ -89,7 +89,7 @@ public:
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
/**
@@ -99,7 +99,7 @@ public:
* @param viewURL the URL shown in the view, to test for RMB click on view background
* @param actions list of actions the caller wants to see in the menu
* @param newMenu "New" menu, shared with the File menu, in konqueror
- * @param tqparentWidget the widget we're showing this popup for. Helps destroying
+ * @param parentWidget the widget we're showing this popup for. Helps destroying
* the popup if the widget is destroyed before the popup.
* @param kpf flags from the KonqPopupFlags enum, set by the calling application
* @param f flags from the BrowserExtension enum, set by the calling part
@@ -117,7 +117,7 @@ public:
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- TQWidget * tqparentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/);
@@ -177,7 +177,7 @@ protected:
KActionCollection m_ownActions;
private:
- void init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
+ void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
void setup(KonqPopupFlags kpf);
void addPlugins( );
int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);