summaryrefslogtreecommitdiffstats
path: root/parts/fileselector
diff options
context:
space:
mode:
Diffstat (limited to 'parts/fileselector')
-rw-r--r--parts/fileselector/fileselector_part.cpp12
-rw-r--r--parts/fileselector/fileselector_part.h2
-rw-r--r--parts/fileselector/fileselector_widget.cpp94
-rw-r--r--parts/fileselector/fileselector_widget.h10
-rw-r--r--parts/fileselector/kbookmarkhandler.h2
-rw-r--r--parts/fileselector/tdeactionselector.cpp26
-rw-r--r--parts/fileselector/tdeactionselector.h2
7 files changed, 74 insertions, 74 deletions
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index de9b5fef..a417931e 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -41,11 +41,11 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS
m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
- connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)),
- this, TQT_SLOT(fileSelected(const KFileItem*)));
- connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+ connect( m_filetree->dirOperator(), TQ_SIGNAL(fileSelected(const KFileItem*)),
+ this, TQ_SLOT(fileSelected(const KFileItem*)));
+ connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) );
- connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) );
+ connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget(KDialogBase*)) );
m_filetree->setCaption( i18n("File Selector") );
m_filetree->setIcon( SmallIcon( info()->icon() ) );
@@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS
m_filetree->readConfig( instance()->config(), "fileselector" );
- m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this, "new_file");
+ m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQ_SLOT(newFile()), this, "new_file");
}
FileSelectorPart::~FileSelectorPart()
@@ -84,7 +84,7 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
{
TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree );
- connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) );
+ connect( dlg, TQ_SIGNAL( okClicked( ) ), page, TQ_SLOT( apply( ) ) );
// ### implement reload
}
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index f415444d..6f96ab5d 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -13,7 +13,7 @@ class KDialogBase;
class FileSelectorPart : public KDevPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
FileSelectorPart(TQObject *parent, const char *name, const TQStringList &);
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 894bf185..83ff0fb6 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
TQVBoxLayout* lo = new TQVBoxLayout(this);
- TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
+ TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
toolbar = new KDevFileSelectorToolBar(tbp);
@@ -133,7 +133,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
lo->addWidget(tbp);
toolbar->setMovingEnabled(false);
toolbar->setFlat(true);
- tqInstallMsgHandler( oldHandler );
+ qInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
@@ -173,41 +173,41 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
filter = new KHistoryCombo( true, filterBox, "filter");
filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
- connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
+ connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) );
lo->addWidget(filterBox);
- connect( filter, TQT_SIGNAL( activated(const TQString&) ),
- TQT_SLOT( slotFilterChange(const TQString&) ) );
+ connect( filter, TQ_SIGNAL( activated(const TQString&) ),
+ TQ_SLOT( slotFilterChange(const TQString&) ) );
- connect( filter, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( slotFilterChange(const TQString&) ) );
- connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
- filter, TQT_SLOT( addToHistory(const TQString&) ) );
+ connect( filter, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( slotFilterChange(const TQString&) ) );
+ connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ),
+ filter, TQ_SLOT( addToHistory(const TQString&) ) );
// tdeaction for the dir sync method
acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0,
- TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+ this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
toolbar->setIconText( TDEToolBar::IconOnly );
toolbar->setIconSize( 16 );
toolbar->setEnableContextMenu( false );
- connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )),
- this, TQT_SLOT( cmbPathActivated( const KURL& ) ));
- connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )),
- this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) ));
- connect(dir, TQT_SIGNAL(urlEntered(const KURL&)),
- this, TQT_SLOT(dirUrlEntered(const KURL&)) );
+ connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )),
+ this, TQ_SLOT( cmbPathActivated( const KURL& ) ));
+ connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )),
+ this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) ));
+ connect(dir, TQ_SIGNAL(urlEntered(const KURL&)),
+ this, TQ_SLOT(dirUrlEntered(const KURL&)) );
- connect(dir, TQT_SIGNAL(finishedLoading()),
- this, TQT_SLOT(dirFinishedLoading()) );
+ connect(dir, TQ_SIGNAL(finishedLoading()),
+ this, TQ_SLOT(dirFinishedLoading()) );
// enable dir sync button if current doc has a valid URL
- connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ),
- this, TQT_SLOT(viewChanged() ) );
+ connect ( partController, TQ_SIGNAL(activePartChanged(KParts::Part*) ),
+ this, TQ_SLOT(viewChanged() ) );
// Connect the bookmark handler
- connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
- this, TQT_SLOT( setDir( const TQString& ) ) );
+ connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )),
+ this, TQ_SLOT( setDir( const TQString& ) ) );
waitingUrl = TQString();
@@ -256,7 +256,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
if ( ! loc.isEmpty() )
{
waitingDir = loc;
- TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack()));
+ TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack()));
}
}
@@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
// connect events as needed
/// @todo - solve startup problem: no need to set location for each doc opened!
if ( autoSyncEvents & DocumentChanged )
- connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) );
+ connect( partController, TQ_SIGNAL( viewChanged() ), this, TQ_SLOT( autoSync() ) );
if ( autoSyncEvents & DocumentOpened )
- connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ),
- this, TQT_SLOT( autoSync(KParts::Part*) ) );
+ connect( partController, TQ_SIGNAL( partAdded(KParts::Part*) ),
+ this, TQ_SLOT( autoSync(KParts::Part*) ) );
}
@@ -519,7 +519,7 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
And the popup is rather useless, if the paths are only partly visible.
*/
TQListBox *lb = cmbPath->listBox();
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show )
+ if ( o == lb && e->type() == TQEvent::Show )
{
int add
= lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
@@ -585,25 +585,25 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect
lo->setSpacing( spacing );
// Toolbar - a lot for a little...
- TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
+ TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this );
acSel = new TDEActionSelector( gbToolbar );
acSel->setAvailableLabel( i18n("A&vailable actions:") );
acSel->setSelectedLabel( i18n("S&elected actions:") );
lo->addWidget( gbToolbar );
- connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
- connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
- connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
- connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) );
// Sync
- TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this );
+ TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this );
cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync );
cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync );
cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync );
lo->addWidget( gbSync );
- connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
- connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
- connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( cbSyncOpen, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
// Histories
TQHBox *hbPathHist = new TQHBox ( this );
@@ -611,22 +611,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect
sbPathHistLength = new TQSpinBox( hbPathHist );
lbPathHist->setBuddy( sbPathHistLength );
lo->addWidget( hbPathHist );
- connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
TQHBox *hbFilterHist = new TQHBox ( this );
TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist );
sbFilterHistLength = new TQSpinBox( hbFilterHist );
lbFilterHist->setBuddy( sbFilterHistLength );
lo->addWidget( hbFilterHist );
- connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
// Session
- TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this );
+ TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this );
cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession );
cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession );
lo->addWidget( gbSession );
- connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
- connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+ connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
// make it look nice
lo->addStretch( 1 );
@@ -713,16 +713,16 @@ void KFSConfigPage::apply()
s |= KDevFileSelector::GotVisible;
fileSelector->autoSyncEvents = s;
// reset connections
- disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) );
+ disconnect( fileSelector->partController, 0, fileSelector, TQ_SLOT( autoSync() ) );
disconnect( fileSelector->partController, 0,
- fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) );
+ fileSelector, TQ_SLOT( autoSync( KParts::Part *) ) );
if ( s & KDevFileSelector::DocumentChanged )
- connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ),
- fileSelector, TQT_SLOT( autoSync() ) );
+ connect( fileSelector->partController, TQ_SIGNAL( viewChanged() ),
+ fileSelector, TQ_SLOT( autoSync() ) );
if ( s & KDevFileSelector::DocumentOpened )
connect( fileSelector->partController,
- TQT_SIGNAL( partAdded(KParts::Part *) ),
- fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) );
+ TQ_SIGNAL( partAdded(KParts::Part *) ),
+ fileSelector, TQ_SLOT( autoSync(KParts::Part *) ) );
// histories
fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() );
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index ef64f88c..9462d383 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -59,7 +59,7 @@ namespace KTextEditor
/* I think this fix for not moving toolbars is better */
class KDevFileSelectorToolBar: public TDEToolBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDevFileSelectorToolBar(TQWidget *parent);
@@ -70,7 +70,7 @@ public:
class KDevFileSelectorToolBarParent: public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDevFileSelectorToolBarParent(TQWidget *parent);
@@ -86,7 +86,7 @@ protected:
class KDevDirOperator: public KDirOperator
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
@@ -103,7 +103,7 @@ private:
class KDevFileSelector : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
friend class KFSConfigPage;
@@ -180,7 +180,7 @@ private:
*/
class KFSConfigPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 4ec065aa..c54f92ca 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -30,7 +30,7 @@ class TDEActionMenu;
class KBookmarkHandler : public TQObject, public KBookmarkOwner
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index 1c639477..488897e5 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -98,18 +98,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
loadIcons();
- connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) );
- connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) );
- connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) );
- connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) );
- connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
- this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
- connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
- this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
- connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
- this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
- connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
- this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
+ connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) );
+ connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) );
+ connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) );
+ connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) );
+ connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+ this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+ connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+ this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+ connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)),
+ this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) );
+ connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)),
+ this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) );
d->availableListBox->installEventFilter( this );
d->selectedListBox->installEventFilter( this );
@@ -391,7 +391,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
}
return true;
}
- else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+ else if ( o->inherits( "TQListBox" ) )
{
switch ( ((TQKeyEvent*)e)->key() )
{
diff --git a/parts/fileselector/tdeactionselector.h b/parts/fileselector/tdeactionselector.h
index 213363cf..2de231eb 100644
--- a/parts/fileselector/tdeactionselector.h
+++ b/parts/fileselector/tdeactionselector.h
@@ -74,7 +74,7 @@ class TDEActionSelectorPrivate;
*/
class TDEActionSelector : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
TQ_ENUMS( ButtonIconSize InsertionPolicy )
TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 12:25:07 +0000