diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 8b5b88a..7ad5400 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -435,7 +435,7 @@ bool KrBookmarkHandler::eventFilter( TQObject *obj, TQEvent *ev ) { case TQt::RightButton: _middleClick = false; if( obj->inherits( "TQPopupMenu" ) ) { - int id = static_cast(TQT_TQWIDGET(obj))->idAt( static_cast(ev)->pos() ); + int id = static_cast(obj)->idAt( static_cast(ev)->pos() ); if( obj == _mainBookmarkPopup && _specialBookmarkIDs.contains( id ) ) { rightClickOnSpecialBookmark(); @@ -446,7 +446,7 @@ bool KrBookmarkHandler::eventFilter( TQObject *obj, TQEvent *ev ) { TQMap * table = _bookmarkIDTable[ obj ]; if( table && table->count( id ) ) { KrBookmark *bm = (*table)[ id ]; - rightClicked( static_cast(TQT_TQWIDGET(obj)), id, bm ); + rightClicked( static_cast(obj), id, bm ); return true; } } diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index 4989a2b..4cbec1a 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -35,7 +35,7 @@ KrKeyDialog::KrKeyDialog( TQWidget * parent ) : KKeyDialog( false /* allow lette // HACK This fetches the layout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. - TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); + TQWidget* buttonBox = static_cast( actionButton(KDialogBase::Ok)->parent() ); TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->layout() ); KPushButton* importButton = new KPushButton( i18n("Import shortcuts"), buttonBox ); diff --git a/krusader/Dialogs/percentalsplitter.cpp b/krusader/Dialogs/percentalsplitter.cpp index 2bb9dc6..9e5dd6b 100644 --- a/krusader/Dialogs/percentalsplitter.cpp +++ b/krusader/Dialogs/percentalsplitter.cpp @@ -130,7 +130,7 @@ void PercentalSplitter::setRubberband ( int p ) { int scr = TQApplication::desktop()->screenNumber( this ); if( label == 0 ) { - label = new TQLabel( TQT_TQWIDGET(TQApplication::desktop()->screen( scr )), "SplitterPercent", WStyle_StaysOnTop | + label = new TQLabel( TQApplication::desktop()->screen( scr ), "SplitterPercent", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); label->setMargin(1); label->setAutoMask( FALSE ); diff --git a/krusader/Filter/filtertabs.cpp b/krusader/Filter/filtertabs.cpp index 01ede00..f1e5339 100644 --- a/krusader/Filter/filtertabs.cpp +++ b/krusader/Filter/filtertabs.cpp @@ -53,7 +53,7 @@ FilterTabs::FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *parent FilterTabs * FilterTabs::addTo( TQTabWidget *tabWidget, int props ) { - return new FilterTabs( props, tabWidget, TQT_TQOBJECT(tabWidget) ); + return new FilterTabs( props, tabWidget, tabWidget ); } void FilterTabs::saveToProfile( TQString name ) diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp index 15e76e0..fdbf60d 100644 --- a/krusader/KViewer/krviewer.cpp +++ b/krusader/KViewer/krviewer.cpp @@ -53,7 +53,7 @@ TQPtrList KrViewer::viewers; KrViewer::KrViewer( TQWidget *parent, const char *name ) : -KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( this ), returnFocusTo( 0 ), returnFocusTab( 0 ), +KParts::MainWindow( parent, name ), manager( this, this ), tabBar( this ), returnFocusTo( 0 ), returnFocusTab( 0 ), reservedKeys(), reservedKeyIDs() { //setWFlags(WType_TopLevel | WDestructiveClose); @@ -64,11 +64,11 @@ KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( tmpFile.setAutoDelete( true ); connect( &manager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - TQT_TQOBJECT(this), TQT_SLOT( createGUI( KParts::Part* ) ) ); + this, TQT_SLOT( createGUI( KParts::Part* ) ) ); connect( &tabBar, TQT_SIGNAL( currentChanged( TQWidget *) ), - TQT_TQOBJECT(this), TQT_SLOT( tabChanged(TQWidget*) ) ); + this, TQT_SLOT( tabChanged(TQWidget*) ) ); connect( &tabBar, TQT_SIGNAL( closeRequest( TQWidget *) ), - TQT_TQOBJECT(this), TQT_SLOT( tabCloseRequest(TQWidget*) ) ); + this, TQT_SLOT( tabCloseRequest(TQWidget*) ) ); tabBar.setTabReorderingEnabled(false); #if KDE_IS_VERSION(3,4,0) @@ -78,28 +78,28 @@ KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( // "document-save-as" setCentralWidget( &tabBar ); - printAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), 0, 0 ); - copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), 0, 0 ); + printAction = KStdAction::print( this, TQT_SLOT( print() ), 0, 0 ); + copyAction = KStdAction::copy( this, TQT_SLOT( copy() ), 0, 0 ); viewerMenu = new TQPopupMenu( this ); - viewerMenu->insertItem( i18n( "&Generic viewer" ), TQT_TQOBJECT(this), TQT_SLOT( viewGeneric() ), CTRL + SHIFT + Key_G, 1 ); - viewerMenu->insertItem( i18n( "&Text viewer" ), TQT_TQOBJECT(this), TQT_SLOT( viewText() ), CTRL + SHIFT + Key_T, 2 ); - viewerMenu->insertItem( i18n( "&Hex viewer" ), TQT_TQOBJECT(this), TQT_SLOT( viewHex() ), CTRL + SHIFT + Key_H, 3 ); + viewerMenu->insertItem( i18n( "&Generic viewer" ), this, TQT_SLOT( viewGeneric() ), CTRL + SHIFT + Key_G, 1 ); + viewerMenu->insertItem( i18n( "&Text viewer" ), this, TQT_SLOT( viewText() ), CTRL + SHIFT + Key_T, 2 ); + viewerMenu->insertItem( i18n( "&Hex viewer" ), this, TQT_SLOT( viewHex() ), CTRL + SHIFT + Key_H, 3 ); viewerMenu->insertSeparator(); - viewerMenu->insertItem( i18n( "Text &editor" ), TQT_TQOBJECT(this), TQT_SLOT( editText() ), CTRL + SHIFT + Key_E, 4 ); + viewerMenu->insertItem( i18n( "Text &editor" ), this, TQT_SLOT( editText() ), CTRL + SHIFT + Key_E, 4 ); viewerMenu->insertSeparator(); - viewerMenu->insertItem( i18n( "&Next tab" ), TQT_TQOBJECT(this), TQT_SLOT( nextTab() ), ALT+Key_Right ); - viewerMenu->insertItem( i18n( "&Previous tab" ), TQT_TQOBJECT(this), TQT_SLOT( prevTab() ), ALT+Key_Left ); + viewerMenu->insertItem( i18n( "&Next tab" ), this, TQT_SLOT( nextTab() ), ALT+Key_Right ); + viewerMenu->insertItem( i18n( "&Previous tab" ), this, TQT_SLOT( prevTab() ), ALT+Key_Left ); - detachActionIndex = viewerMenu->insertItem( i18n( "&Detach tab" ), TQT_TQOBJECT(this), TQT_SLOT( detachTab() ), CTRL + SHIFT + Key_D ); + detachActionIndex = viewerMenu->insertItem( i18n( "&Detach tab" ), this, TQT_SLOT( detachTab() ), CTRL + SHIFT + Key_D ); //no point in detaching only one tab.. viewerMenu->setItemEnabled(detachActionIndex,false); viewerMenu->insertSeparator(); - viewerMenu->insertItem( printAction->text(), TQT_TQOBJECT(this), TQT_SLOT( print() ), printAction->shortcut() ); - viewerMenu->insertItem( copyAction->text(), TQT_TQOBJECT(this), TQT_SLOT( copy() ), copyAction->shortcut() ); + viewerMenu->insertItem( printAction->text(), this, TQT_SLOT( print() ), printAction->shortcut() ); + viewerMenu->insertItem( copyAction->text(), this, TQT_SLOT( copy() ), copyAction->shortcut() ); viewerMenu->insertSeparator(); - tabCloseID = viewerMenu->insertItem( i18n( "&Close current tab" ), TQT_TQOBJECT(this), TQT_SLOT( tabCloseRequest() ), Key_Escape ); - closeID = viewerMenu->insertItem( i18n( "&Quit" ), TQT_TQOBJECT(this), TQT_SLOT( close() ), CTRL + Key_Q ); + tabCloseID = viewerMenu->insertItem( i18n( "&Close current tab" ), this, TQT_SLOT( tabCloseRequest() ), Key_Escape ); + closeID = viewerMenu->insertItem( i18n( "&Quit" ), this, TQT_SLOT( close() ), CTRL + Key_Q ); //toolBar() ->insertLined("Edit:",1,"",this,"",true ,i18n("Enter an URL to edit and press enter")); @@ -111,7 +111,7 @@ KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( KrViewer::~KrViewer() { disconnect( &manager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - TQT_TQOBJECT(this), TQT_SLOT( createGUI( KParts::Part* ) ) ); + this, TQT_SLOT( createGUI( KParts::Part* ) ) ); viewers.remove( this ); delete printAction; @@ -125,7 +125,7 @@ void KrViewer::createGUI( KParts::Part* part ) { // and show the new part widget connect( part, TQT_SIGNAL( setStatusBarText( const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText( const TQString& ) ) ); + this, TQT_SLOT( slotSetStatusBarText( const TQString& ) ) ); KParts::MainWindow::createGUI( part ); toolBar() ->insertLineSeparator(0); @@ -179,9 +179,9 @@ bool KrViewer::eventFilter ( TQObject * /* watched */, TQEvent * e ) // don't activate the close functions immediately! // it can cause crash if( id == tabCloseID ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( tabCloseRequest() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( tabCloseRequest() ) ); else if( id == closeID ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( close() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( close() ) ); else { int index = viewerMenu->indexOf( id ); viewerMenu->activateItemAt( index ); @@ -439,7 +439,7 @@ void KrViewer::editText(){ } void KrViewer::checkModified(){ - TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(checkModified()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(checkModified()) ); PanelViewerBase* pvb = static_cast( tabBar.currentPage() ); if( !pvb ) return; @@ -609,10 +609,10 @@ bool KrViewer::viewGeneric() { if ( mimetype.contains( "html" ) ) { TDEHTMLPart * p = new TDEHTMLPart( this, 0, 0, 0, TDEHTMLPart::BrowserViewGUI ); connect( p->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - TQT_TQOBJECT(this), TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + this, TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); /* At JavaScript self.close() the TDEHTMLPart destroys itself. */ /* After destruction, just close the window */ - connect( p, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) ); + connect( p, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( close() ) ); p-> openURL( url ); generic_part = p; diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp index 6fefc51..22fa1e5 100644 --- a/krusader/KViewer/panelviewer.cpp +++ b/krusader/KViewer/panelviewer.cpp @@ -116,7 +116,7 @@ KParts::ReadOnlyPart* PanelViewer::getPart( TQString mimetype ) { { factory = KLibLoader::self() ->factory( ptr->library().latin1() ); if ( factory ) { - part = static_cast( factory->create( TQT_TQOBJECT(this), + part = static_cast( factory->create( this, ptr->name().latin1(), TQString( "KParts::ReadOnlyPart" ).latin1(), args ) ); } } @@ -137,7 +137,7 @@ KParts::ReadOnlyPart* PanelViewer::getHexPart(){ KLibFactory * factory = KLibLoader::self() ->factory( "libkhexedit2part" ); if ( factory ) { // Create the part - part = ( KParts::ReadOnlyPart * ) factory->create( TQT_TQOBJECT(this), "hexedit2part","KParts::ReadOnlyPart" ); + part = ( KParts::ReadOnlyPart * ) factory->create( this, "hexedit2part","KParts::ReadOnlyPart" ); } return part; @@ -279,7 +279,7 @@ KParts::ReadWritePart* PanelEditor::getPart( TQString mimetype ) { { factory = KLibLoader::self() ->factory( ptr->library().latin1() ); if ( factory ) { - part = static_cast( factory->create( TQT_TQOBJECT(this), + part = static_cast( factory->create( this, ptr->name().latin1(), TQString( "KParts::ReadWritePart" ).latin1(), args ) ); } } diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp index dd33714..7ec0d43 100644 --- a/krusader/Konfigurator/kglookfeel.cpp +++ b/krusader/Konfigurator/kglookfeel.cpp @@ -141,7 +141,7 @@ void KgLookFeel::setupPanelTab() { { i18n( "32" ), "32" }, { i18n( "48" ), "48" }}; KonfiguratorComboBox *iconCombo = createComboBox( "Look&Feel", "Filelist Icon Size", _FilelistIconSize, iconSizes, 4, hbox2, true, true, PAGE_PANEL ); - iconCombo->lineEdit()->setValidator( new TQRegExpValidator( TQRegExp( "[1-9]\\d{0,1}" ), TQT_TQOBJECT(iconCombo) ) ); + iconCombo->lineEdit()->setValidator( new TQRegExpValidator( TQRegExp( "[1-9]\\d{0,1}" ), iconCombo ) ); createSpacer ( hbox2 ); panelGrid->addWidget( hbox2, 1, 0 ); diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp index c91a591..f8fe5fd 100644 --- a/krusader/Konfigurator/kguseractions.cpp +++ b/krusader/Konfigurator/kguseractions.cpp @@ -99,7 +99,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) } void KgUserActions::startActionMan() { - ActionMan actionMan( TQT_TQWIDGET(parent()) ); + ActionMan actionMan( static_cast(parent()) ); } diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp index 898917e..17bf3a5 100644 --- a/krusader/Konfigurator/konfiguratoritems.cpp +++ b/krusader/Konfigurator/konfiguratoritems.cpp @@ -95,12 +95,12 @@ KonfiguratorCheckBox::KonfiguratorCheckBox( TQString cls, TQString name, bool df TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQCheckBox( text, parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( stateChanged( int ) ), ext, TQT_SLOT( setChanged() ) ); + connect( this, TQT_SIGNAL( stateChanged( int ) ), ext, TQT_SLOT( setChanged() ) ); loadInitialValue(); } @@ -135,12 +135,12 @@ KonfiguratorSpinBox::KonfiguratorSpinBox( TQString cls, TQString name, int dflt, TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQSpinBox( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( valueChanged(int) ), ext, TQT_SLOT( setChanged() ) ); + connect( this, TQT_SIGNAL( valueChanged(int) ), ext, TQT_SLOT( setChanged() ) ); setMinValue( min ); setMaxValue( max ); @@ -207,10 +207,10 @@ KonfiguratorRadioButtons::KonfiguratorRadioButtons( TQString cls, TQString name, TQString dflt, TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQButtonGroup( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); } KonfiguratorRadioButtons::~KonfiguratorRadioButtons() @@ -302,12 +302,12 @@ KonfiguratorEditBox::KonfiguratorEditBox( TQString cls, TQString name, TQString TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQLineEdit( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( textChanged(const TQString &) ), ext, TQT_SLOT( setChanged() ) ); + connect( this, TQT_SIGNAL( textChanged(const TQString &) ), ext, TQT_SLOT( setChanged() ) ); loadInitialValue(); } @@ -344,12 +344,12 @@ KonfiguratorURLRequester::KonfiguratorURLRequester( TQString cls, TQString name, TQWidget *parent, const char *widgetName, bool rst, int pg ) : KURLRequester( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( textChanged(const TQString &) ), ext, TQT_SLOT( setChanged() ) ); + connect( this, TQT_SIGNAL( textChanged(const TQString &) ), ext, TQT_SLOT( setChanged() ) ); button()->setIconSet( SmallIcon( "document-open" ) ); loadInitialValue(); @@ -386,16 +386,16 @@ KonfiguratorFontChooser::KonfiguratorFontChooser( TQString cls, TQString name, T TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQHBox ( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); pLabel = new TQLabel( this ); pLabel->setMinimumWidth( 150 ); pToolButton = new TQToolButton( this ); - connect( pToolButton, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotBrowseFont() ) ); + connect( pToolButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseFont() ) ); pToolButton->setIconSet( SmallIcon( "document-open" ) ); @@ -458,14 +458,14 @@ KonfiguratorComboBox::KonfiguratorComboBox( TQString cls, TQString name, TQStrin insertItem( list[i].text ); } - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); -// connect( TQT_TQOBJECT(this), TQT_SIGNAL( highlighted(int) ), ext, TQT_SLOT( setChanged() ) ); /* Removed because of startup combo failure */ - connect( TQT_TQOBJECT(this), TQT_SIGNAL( activated(int) ), ext, TQT_SLOT( setChanged() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( textChanged ( const TQString & ) ), ext, TQT_SLOT( setChanged() ) ); +// connect( this, TQT_SIGNAL( highlighted(int) ), ext, TQT_SLOT( setChanged() ) ); /* Removed because of startup combo failure */ + connect( this, TQT_SIGNAL( activated(int) ), ext, TQT_SLOT( setChanged() ) ); + connect( this, TQT_SIGNAL( textChanged ( const TQString & ) ), ext, TQT_SLOT( setChanged() ) ); setEditable( editable ); loadInitialValue(); @@ -529,11 +529,11 @@ KonfiguratorColorChooser::KonfiguratorColorChooser( TQString cls, TQString name, int addColNum, int pg ) : TQComboBox ( parent, widgetName ), defaultValue( dflt ), disableColorChooser( true ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); addColor( i18n("Custom color" ), TQColor( 255, 255, 255 ) ); addColor( i18n("Default" ), defaultValue ); @@ -562,7 +562,7 @@ KonfiguratorColorChooser::KonfiguratorColorChooser( TQString cls, TQString name, addColor( i18n("Dark Gray" ), TQt::darkGray ); addColor( i18n("Black" ), TQt::black ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotCurrentChanged( int ) ) ); + connect( this, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCurrentChanged( int ) ) ); loadInitialValue(); } @@ -742,10 +742,10 @@ KonfiguratorListBox::KonfiguratorListBox( TQString cls, TQString name, TQStringL TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQListBox( parent, widgetName ), defaultValue( dflt ) { - ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); - connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); - connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( slotSetDefaults(TQObject *) ) ); - connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), TQT_TQOBJECT(this), TQT_SLOT( loadInitialValue() ) ); + ext = new KonfiguratorExtension( this, cls, name, rst, pg ); + connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), this, TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); + connect( ext, TQT_SIGNAL( setDefaultsAuto(TQObject *) ), this, TQT_SLOT( slotSetDefaults(TQObject *) ) ); + connect( ext, TQT_SIGNAL( setInitialValue(TQObject *) ), this, TQT_SLOT( loadInitialValue() ) ); loadInitialValue(); } diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index 403cfc8..9aa3940 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -872,7 +872,7 @@ void ListPanel::handleDropOnView( TQDropEvent *e, TQWidget *widget ) { dir = i->name(); } TQWidget *notify = ( !e->source() ? 0 : e->source() ); - tempFiles->vfs_addFiles( &URLs, mode, TQT_TQOBJECT(notify), dir ); + tempFiles->vfs_addFiles( &URLs, mode, notify, dir ); } void ListPanel::startDragging( TQStringList names, TQPixmap px ) { diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp index 3cd1729..1b9aacc 100644 --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -148,7 +148,7 @@ void ListPanelFunc::immediateOpenUrl( const KURL& urlIn ) { KURL u = urlStack.pop(); //u.adjustPath(-1); // remove trailing "/" u.cleanPath(); // Resolves "." and ".." components in path. - v = KrVfsHandler::getVfs( u, TQT_TQOBJECT(panel), files() ); + v = KrVfsHandler::getVfs( u, panel, files() ); if ( !v ) continue; //this should not happen ! if ( v != vfsP ) { @@ -1153,7 +1153,7 @@ ListPanelFunc::~ListPanelFunc() { vfs* ListPanelFunc::files() { if ( !vfsP ) - vfsP = KrVfsHandler::getVfs( "/", TQT_TQOBJECT(panel), 0 ); + vfsP = KrVfsHandler::getVfs( "/", panel, 0 ); return vfsP; } diff --git a/krusader/Splitter/splittergui.h b/krusader/Splitter/splittergui.h index bb1b411..10f23bc 100644 --- a/krusader/Splitter/splittergui.h +++ b/krusader/Splitter/splittergui.h @@ -60,7 +60,7 @@ struct PredefinedDevice { setMaxValue( 0x7FFFFFFF ); /* setting the minimum and maximum values */ setMinValue( 1 ); - TQDoubleValidator *dval = new TQDoubleValidator( TQT_TQOBJECT(this) ); + TQDoubleValidator *dval = new TQDoubleValidator( this ); setValidator ( dval ); } diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index fbd5f18..8ac26a3 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -93,7 +93,7 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { // HACK This fetches the layout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. - TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); + TQWidget* buttonBox = static_cast( actionButton(KDialogBase::Ok)->parent() ); TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->layout() ); TQCheckBox* useFixedFont = new TQCheckBox( i18n("Use font with fixed width"), buttonBox ); buttonBoxLayout->insertWidget( 0, useFixedFont ); diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp index ee68521..506a648 100644 --- a/krusader/VFS/temp_vfs.cpp +++ b/krusader/VFS/temp_vfs.cpp @@ -41,7 +41,7 @@ #include "../krservices.h" temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ): - normal_vfs(TQT_TQOBJECT(panel)){ + normal_vfs(panel){ vfs_type=TEMP; // first we need to create a temp diretory tmpDir = krApp->getTempDir(); diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp index a415c75..89561f0 100644 --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -213,7 +213,7 @@ Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|T // create the "krusader" App = this; - slot = new KRslots(TQT_TQOBJECT(this)); + slot = new KRslots(this); setXMLFile( "krusaderui.rc" ); // kpart-related xml file plzWait = new KRPleaseWaitHandler(); @@ -245,7 +245,7 @@ Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|T // create bookman bookman = new KrBookmarkHandler(); - popularUrls = new PopularUrls(TQT_TQOBJECT(this)); + popularUrls = new PopularUrls(this); queueManager = new QueueManager(); @@ -370,7 +370,7 @@ Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|T sysTray->setPixmap( iconLoader->loadIcon( privIcon(), TDEIcon::Panel, 22 ) ); sysTray->hide(); - connect( sysTray, TQT_SIGNAL( quitSelected() ), TQT_TQOBJECT(this), TQT_SLOT( setDirectExit() ) ); + connect( sysTray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( setDirectExit() ) ); setCentralWidget( mainView ); config->setGroup( "Startup" ); @@ -511,7 +511,7 @@ void Krusader::hideEvent ( TQHideEvent *e ) { bool isModalTopWidget = false; - TQWidget *actWnd = TQT_TQWIDGET(tqApp->activeWindow()); + TQWidget *actWnd = tqApp->activeWindow(); if ( actWnd ) isModalTopWidget = actWnd->isModal(); @@ -539,7 +539,7 @@ void Krusader::setupAccels() { SHIFT + Key_F3, SLOTS, TQT_SLOT( viewDlg() ) ); // Tab accels->insert( "Tab-Switch panel", i18n( "Tab: switch panel" ), TQString(), - Key_Tab, TQT_TQOBJECT(mainView), TQT_SLOT( panelSwitch() ) ); + Key_Tab, mainView, TQT_SLOT( panelSwitch() ) ); } @@ -566,7 +566,7 @@ void Krusader::setupActions() { new TDEToggleAction( i18n("Show Actions Toolbar"), 0, SLOTS, TQT_SLOT( toggleActionsToolbar() ), actionCollection(), "toggle actions toolbar" ); actShowStatusBar = KStdAction::showStatusbar( SLOTS, TQT_SLOT( toggleStatusbar() ), actionCollection(), "std_statusbar" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection(), "std_quit" ); + KStdAction::quit( this, TQT_SLOT( slotClose() ), actionCollection(), "std_quit" ); KStdAction::configureToolbars( SLOTS, TQT_SLOT( configToolbar() ), actionCollection(), "std_config_toolbar" ); KStdAction::keyBindings( SLOTS, TQT_SLOT( configKeys() ), actionCollection(), "std_config_keys" ); @@ -615,7 +615,7 @@ void Krusader::setupActions() { actFTPNewConnect = new TDEAction( i18n( "New Net &Connection..." ), "connect_creating", CTRL + Key_N, SLOTS, TQT_SLOT( newFTPconnection() ), actionCollection(), "ftp new connection" ); actProfiles = new TDEAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L, - TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( profiles() ), actionCollection(), "profile" ); + MAIN_VIEW, TQT_SLOT( profiles() ), actionCollection(), "profile" ); actCalculate = new TDEAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0, SLOTS, TQT_SLOT( calcSpace() ), actionCollection(), "calculate" ); actCreateChecksum = new TDEAction( i18n( "Create Checksum..." ), "application-octet-stream", 0, @@ -721,7 +721,7 @@ void Krusader::setupActions() { actRoot = new TDEAction( i18n( "Root" ), "go-top", CTRL + Key_Backspace, SLOTS, TQT_SLOT( root() ), actionCollection(), "root" ); actSavePosition = new TDEAction( i18n( "Save &Position" ), 0, - TQT_TQOBJECT(krApp), TQT_SLOT( savePosition() ), actionCollection(), "save position" ); + krApp, TQT_SLOT( savePosition() ), actionCollection(), "save position" ); actAllFilter = new TDEAction( i18n( "&All Files" ), SHIFT + Key_F10, SLOTS, TQT_SLOT( allFilter() ), actionCollection(), "all files" ); //actExecFilter = new TDEAction( i18n( "&Executables" ), SHIFT + Key_F11, @@ -760,7 +760,7 @@ void Krusader::setupActions() { SLOTS, TQT_SLOT( newSymlink() ), actionCollection(), "new symlink"); new TDEToggleAction( i18n( "Toggle Popup Panel" ), ALT + Key_Down, SLOTS, TQT_SLOT( togglePopupPanel() ), actionCollection(), "toggle popup panel" ); - actVerticalMode = new TDEToggleAction( i18n( "Vertical Mode" ), "view_top_bottom", ALT + CTRL + Key_R, TQT_TQOBJECT(MAIN_VIEW), + actVerticalMode = new TDEToggleAction( i18n( "Vertical Mode" ), "view_top_bottom", ALT + CTRL + Key_R, MAIN_VIEW, TQT_SLOT( toggleVerticalMode() ), actionCollection(), "toggle vertical mode" ); actNewTab = new TDEAction( i18n( "New Tab" ), "tab_new", ALT + CTRL + Key_N, SLOTS, TQT_SLOT( newTab() ), actionCollection(), "new tab" ); @@ -798,7 +798,7 @@ void Krusader::setupActions() { actF9 = new TDEAction( i18n( "Rename" ), Key_F9, SLOTS, TQT_SLOT( rename() ) , actionCollection(), "F9_Rename" ); actF10 = new TDEAction( i18n( "Quit" ), Key_F10, - TQT_TQOBJECT(this), TQT_SLOT( slotClose() ) , actionCollection(), "F10_Quit" ); + this, TQT_SLOT( slotClose() ) , actionCollection(), "F10_Quit" ); actPopularUrls = new TDEAction( i18n("Popular URLs..."), CTRL+Key_Z, popularUrls, TQT_SLOT( showDialog() ), actionCollection(), "Popular_Urls"); actLocationBar = new TDEAction( i18n("Go to Location Bar"), CTRL+Key_L, @@ -808,7 +808,7 @@ void Krusader::setupActions() { actSetJumpBack = new TDEAction( i18n("Set Jump Back Point"), "kr_setjumpback", CTRL+SHIFT+Key_J, SLOTS, TQT_SLOT( slotSetJumpBack() ), actionCollection(), "set_jump_back"); actSwitchFullScreenTE = new TDEAction( i18n( "Toggle Fullwidget Terminal Emulator" ), 0, CTRL + Key_F, - TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( switchFullScreenTE() ), actionCollection(), "switch_fullscreen_te" ); + MAIN_VIEW, TQT_SLOT( switchFullScreenTE() ), actionCollection(), "switch_fullscreen_te" ); // and at last we can set the tool-tips actSelect->setToolTip( i18n( "Select files using a filter" ) ); @@ -979,7 +979,7 @@ bool Krusader::queryClose() { for(;;) { TQWidgetList * list = TQApplication::topLevelWidgets(); - TQWidget *activeModal = TQT_TQWIDGET(TQApplication::activeModalWidget()); + TQWidget *activeModal = TQApplication::activeModalWidget(); TQWidget *w = list->first(); if( activeModal && activeModal != this && activeModal != menuBar() && activeModal != sysTray && list->contains( activeModal ) && !activeModal->isHidden() ) diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index 72ddf21..b10182f 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -162,7 +162,7 @@ void KrusaderView::createTE() { TQWidget *focusW = tqApp->focusWidget(); // Create the part konsole_part = ( KParts::ReadOnlyPart * ) - factory->create( TQT_TQOBJECT(terminal_dock), "konsolepart", + factory->create( terminal_dock, "konsolepart", "KParts::ReadOnlyPart" ); if( konsole_part ) { //loaded successfully connect( konsole_part, TQT_SIGNAL( destroyed() ), diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp index 75ba7c3..7ec8c34 100644 --- a/krusader/paneltabbar.cpp +++ b/krusader/paneltabbar.cpp @@ -32,7 +32,7 @@ #define DISPLAY(X) (X.isLocalFile() ? X.path() : X.prettyURL()) PanelTabBar::PanelTabBar(TQWidget *parent): TQTabBar(parent), _maxTabLength(0) { - _panelActionMenu = new TDEActionMenu( i18n("Panel"), TQT_TQOBJECT(this) ); + _panelActionMenu = new TDEActionMenu( i18n("Panel"), this ); setAcceptDrops(true); insertAction(krNewTab); @@ -172,7 +172,7 @@ TQString PanelTabBar::squeeze(TQString text, int index) { TQFontMetrics fm(fontMetrics()); // set the real max length - _maxTabLength = (TQT_TQWIDGET(parent())->width()-(6*fm.width("W")))/fm.width("W"); + _maxTabLength = (static_cast(parent())->width()-(6*fm.width("W")))/fm.width("W"); // each tab gets a fair share of the max tab length int _effectiveTabLength = _maxTabLength / (count() == 0 ? 1 : count());