diff options
Diffstat (limited to 'src')
106 files changed, 525 insertions, 530 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d4cc44d..43e81e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -116,14 +116,9 @@ install( tde_create_translated_desktop( SOURCE kbibtex_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files ) -tde_create_translated_desktop( - SOURCE ${PROJECT_NAME}.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files -) +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) install( FILES kbibtex_part.rc diff --git a/src/commentwidget.h b/src/commentwidget.h index 75df8fc..ae75eff 100644 --- a/src/commentwidget.h +++ b/src/commentwidget.h @@ -32,7 +32,7 @@ namespace KBibTeX { class CommentWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CommentWidget( BibTeX::Comment *comment, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~CommentWidget(); diff --git a/src/documentlistview.cpp b/src/documentlistview.cpp index f221b5d..e3704de 100644 --- a/src/documentlistview.cpp +++ b/src/documentlistview.cpp @@ -84,10 +84,10 @@ namespace KBibTeX setAcceptDrops( TRUE ); setDropVisualizer( TRUE ); - connect( header(), SIGNAL( clicked( int ) ), this, SLOT( setSortingColumn( int ) ) ); - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, SLOT( showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( slotDoubleClick( TQListViewItem* ) ) ); - connect( this, SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( header(), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( setSortingColumn( int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT( showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( slotDoubleClick( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); } DocumentListView::~DocumentListView() @@ -185,7 +185,7 @@ namespace KBibTeX m_unreadItems.append( after ); emit modified(); - TQTimer::singleShot( 3500, this, SLOT( makeNewItemsUnread() ) ); + TQTimer::singleShot( 3500, this, TQ_SLOT( makeNewItemsUnread() ) ); return after; } @@ -227,8 +227,8 @@ namespace KBibTeX void DocumentListView::deferredInitialization() { - connect( header(), SIGNAL( sizeChange( int, int, int ) ), this, SLOT( saveColumnWidths() ) ); - connect( header(), SIGNAL( indexChange( int, int, int ) ), this, SLOT( saveColumnIndex() ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), this, TQ_SLOT( saveColumnWidths() ) ); + connect( header(), TQ_SIGNAL( indexChange( int, int, int ) ), this, TQ_SLOT( saveColumnIndex() ) ); } void DocumentListView::restoreState() @@ -252,7 +252,7 @@ namespace KBibTeX m_headerMenu = actionMenu->popupMenu(); m_headerMenu->insertTitle( i18n( "Show Columns" ) ); m_headerMenu->setCheckable( TRUE ); - connect( m_headerMenu, SIGNAL( activated( int ) ), this, SLOT( activateShowColumnMenu( int ) ) ); + connect( m_headerMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activateShowColumnMenu( int ) ) ); Settings * settings = Settings::self( m_bibtexFile ); diff --git a/src/documentlistview.h b/src/documentlistview.h index 37adc02..6e3cb5a 100644 --- a/src/documentlistview.h +++ b/src/documentlistview.h @@ -39,7 +39,7 @@ namespace KBibTeX class DocumentListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocumentListView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentListView(); diff --git a/src/documentsourceview.cpp b/src/documentsourceview.cpp index 9d2b06b..d26ad85 100644 --- a/src/documentsourceview.cpp +++ b/src/documentsourceview.cpp @@ -218,7 +218,7 @@ namespace KBibTeX TQBuffer buffer; buffer.open( IO_WriteOnly ); BibTeX::FileExporterBibTeX * exporter = new BibTeX::FileExporterBibTeX(); - connect( exporter, SIGNAL( progress( int, int ) ), this, SLOT( updateProgress( int, int ) ) ); + connect( exporter, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( updateProgress( int, int ) ) ); exporter->setStringDelimiter( settings->fileIO_BibtexStringOpenDelimiter, settings->fileIO_BibtexStringCloseDelimiter ); exporter->setKeywordCasing( settings->fileIO_KeywordCasing ); exporter->setEncoding( "latex" ); @@ -296,7 +296,7 @@ namespace KBibTeX m_editInterface = editInterface( m_document ); m_document->setReadWrite( !m_isReadOnly ); if ( !m_isReadOnly ) - connect( m_document, SIGNAL( textChanged() ), this, SIGNAL( modified() ) ); + connect( m_document, TQ_SIGNAL( textChanged() ), this, TQ_SIGNAL( modified() ) ); TQBoxLayout * layout = new TQVBoxLayout( this ); layout->addWidget( static_cast<TQWidget*>( m_view ) ); diff --git a/src/documentsourceview.h b/src/documentsourceview.h index 7752092..1536948 100644 --- a/src/documentsourceview.h +++ b/src/documentsourceview.h @@ -39,7 +39,7 @@ namespace KBibTeX */ class DocumentSourceView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DocumentSourceView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentSourceView(); diff --git a/src/documentwidget.cpp b/src/documentwidget.cpp index e31e868..fa99d89 100644 --- a/src/documentwidget.cpp +++ b/src/documentwidget.cpp @@ -143,19 +143,19 @@ namespace KBibTeX m_sourceView->setFont( TDEGlobalSettings::fixedFont() ); // Setup actions - connect( m_searchBar, SIGNAL( onlineSearch() ), this, SLOT( onlineSearch() ) ); - connect( m_searchBar, SIGNAL( doSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_listViewElements, SLOT( filter( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); - connect( m_listViewElements, SIGNAL( executed( DocumentListViewItem* ) ), this, SLOT( executeElement( DocumentListViewItem* ) ) ); - connect( m_listViewElements, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listViewElements, SIGNAL( currentChanged( TQListViewItem* ) ), this, SLOT( slotPreviewElement( TQListViewItem* ) ) ); - connect( m_listViewElements, SIGNAL( clicked( TQListViewItem* ) ), this, SLOT( slotPreviewElement( TQListViewItem* ) ) ); - connect( this, SIGNAL( currentChanged( TQWidget * ) ), this, SLOT( slotTabChanged( TQWidget* ) ) ); - connect( m_sourceView, SIGNAL( modified() ), this, SLOT( slotModified() ) ); - connect( m_listViewElements, SIGNAL( modified() ), this, SLOT( slotModified() ) ); - connect( m_sideBar, SIGNAL( valueRenamed() ), this, SLOT( slotModified() ) ); - connect( m_sideBar, SIGNAL( valueRenamed() ), this, SLOT( refreshBibTeXFile() ) ); - connect( m_sideBar, SIGNAL( selected( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_searchBar, SLOT( setSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); - connect( &m_dirWatch, SIGNAL( dirty( const TQString& ) ), this, SLOT( slotFileGotDirty( const TQString & ) ) ); + connect( m_searchBar, TQ_SIGNAL( onlineSearch() ), this, TQ_SLOT( onlineSearch() ) ); + connect( m_searchBar, TQ_SIGNAL( doSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_listViewElements, TQ_SLOT( filter( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); + connect( m_listViewElements, TQ_SIGNAL( executed( DocumentListViewItem* ) ), this, TQ_SLOT( executeElement( DocumentListViewItem* ) ) ); + connect( m_listViewElements, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listViewElements, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem* ) ) ); + connect( m_listViewElements, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget * ) ), this, TQ_SLOT( slotTabChanged( TQWidget* ) ) ); + connect( m_sourceView, TQ_SIGNAL( modified() ), this, TQ_SLOT( slotModified() ) ); + connect( m_listViewElements, TQ_SIGNAL( modified() ), this, TQ_SLOT( slotModified() ) ); + connect( m_sideBar, TQ_SIGNAL( valueRenamed() ), this, TQ_SLOT( slotModified() ) ); + connect( m_sideBar, TQ_SIGNAL( valueRenamed() ), this, TQ_SLOT( refreshBibTeXFile() ) ); + connect( m_sideBar, TQ_SIGNAL( selected( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_searchBar, TQ_SLOT( setSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); + connect( &m_dirWatch, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileGotDirty( const TQString & ) ) ); } @@ -626,10 +626,10 @@ namespace KBibTeX m_viewDocumentActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "view_document" ) ); if ( m_viewDocumentActionMenu != NULL ) - connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) ); + connect( m_viewDocumentActionMenu->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotViewDocument( int ) ) ); m_assignKeywordsActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "assign_keywords" ) ); if ( m_assignKeywordsActionMenu != NULL ) - connect( m_assignKeywordsActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( m_assignKeywordsActionMenu->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); m_actionEditCut = client->action( "edit_cut" ); m_actionEditCopy = client->action( "edit_copy" ); @@ -789,7 +789,7 @@ namespace KBibTeX int maxCountPerSubMenu = ( int )sqrt( allKeywords.count() ) + 1; int countPerSubMenu = 0; TDEPopupMenu *subMenu = new TDEPopupMenu( popup ); - connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); TQString startWord, endWord; for ( TQStringList::Iterator it = allKeywords.begin(); it != allKeywords.end(); ++it ) { @@ -805,7 +805,7 @@ namespace KBibTeX { popup->insertItem( TQString( i18n( "%1 ... %2" ) ).arg( startWord ).arg( endWord ), subMenu ); subMenu = new TDEPopupMenu( popup ); - connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); countPerSubMenu = 0; } } @@ -833,7 +833,7 @@ namespace KBibTeX container->setFocusPolicy( TQWidget::ClickFocus ); popup->insertItem( container ); - connect( m_lineEditNewKeyword, SIGNAL( returnPressed() ), this, SLOT( slotAddKeyword() ) ); + connect( m_lineEditNewKeyword, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddKeyword() ) ); } void DocumentWidget::deferredInitialization() @@ -1141,15 +1141,15 @@ namespace KBibTeX { m_progressDialog = new TQProgressDialog( this ); m_progressDialog->setLabelText( label ); - connect( progressFrom, SIGNAL( progress( int, int ) ), this, SLOT( slotShowProgress( int, int ) ) ); - connect( m_progressDialog, SIGNAL( canceled() ), progressFrom, SLOT( cancel( ) ) ); + connect( progressFrom, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( slotShowProgress( int, int ) ) ); + connect( m_progressDialog, TQ_SIGNAL( canceled() ), progressFrom, TQ_SLOT( cancel( ) ) ); TQApplication::setOverrideCursor( TQt::waitCursor ); } void DocumentWidget::endProgress( TQObject * progressFrom ) { - disconnect( progressFrom, SIGNAL( progress( int, int ) ), this, SLOT( slotShowProgress( int, int ) ) ); - disconnect( m_progressDialog, SIGNAL( canceled() ), progressFrom, SLOT( cancel( ) ) ); + disconnect( progressFrom, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( slotShowProgress( int, int ) ) ); + disconnect( m_progressDialog, TQ_SIGNAL( canceled() ), progressFrom, TQ_SLOT( cancel( ) ) ); delete m_progressDialog; m_progressDialog = NULL; TQApplication::restoreOverrideCursor(); @@ -1545,7 +1545,7 @@ namespace KBibTeX if ( path == m_filename ) { m_dirWatch.removeFile( m_filename ); - TQTimer::singleShot( 100, this, SLOT( slotRefreshDirtyFile( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotRefreshDirtyFile( ) ) ); } } diff --git a/src/documentwidget.h b/src/documentwidget.h index 9256b96..d40ecad 100644 --- a/src/documentwidget.h +++ b/src/documentwidget.h @@ -51,7 +51,7 @@ namespace KBibTeX class DocumentWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: DocumentWidget( bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentWidget(); diff --git a/src/entrywidget.cpp b/src/entrywidget.cpp index c1af4b3..46cad7c 100644 --- a/src/entrywidget.cpp +++ b/src/entrywidget.cpp @@ -85,8 +85,8 @@ namespace KBibTeX m_pushButtonForceDefaultIdSuggestion->setEnabled( !m_isReadOnly && m_defaultIdSuggestionAvailable ); m_pushButtonIdSuggestions->setEnabled( !m_isReadOnly ); - connect( m_wqa, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); - connect( m_wqa, SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endExternalSearch( WebQuery::Status ) ) ); + connect( m_wqa, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); + connect( m_wqa, TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endExternalSearch( WebQuery::Status ) ) ); } EntryWidget::EntryWidget( BibTeX::Entry *entry, BibTeX::File *bibtexfile, bool isReadOnly, bool isNew, TQDialog *parent, const char *name ) @@ -102,8 +102,8 @@ namespace KBibTeX reset(); - connect( m_wqa, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); - connect( m_wqa, SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endExternalSearch( WebQuery::Status ) ) ); + connect( m_wqa, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); + connect( m_wqa, TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endExternalSearch( WebQuery::Status ) ) ); } EntryWidget::~EntryWidget() @@ -331,7 +331,7 @@ namespace KBibTeX m_pushButtonIdSuggestions = new TQPushButton( TQIconSet( BarIcon( "wizard" ) ), "", this, "m_pushButtonIdSuggestions" ); m_menuIdSuggestions = new TQPopupMenu( m_pushButtonIdSuggestions ); - connect( m_menuIdSuggestions, SIGNAL( activated( int ) ), this, SLOT( insertIdSuggestion( int ) ) ); + connect( m_menuIdSuggestions, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( insertIdSuggestion( int ) ) ); m_pushButtonIdSuggestions->setPopup( m_menuIdSuggestions ); layout->addWidget( m_pushButtonIdSuggestions, 0, 4 ); @@ -352,7 +352,7 @@ namespace KBibTeX m_pushButtonRefetch = new TQPushButton( TDEGlobal::iconLoader() ->loadIconSet( "reload", TDEIcon::Small ), i18n( "Refetch" ), this ); layout->addWidget( m_pushButtonRefetch, 2, 5 ); - connect( m_pushButtonRefetch, SIGNAL( clicked() ), this, SLOT( refreshFromURL() ) ); + connect( m_pushButtonRefetch, TQ_SIGNAL( clicked() ), this, TQ_SLOT( refreshFromURL() ) ); if ( showWarnings ) { @@ -361,21 +361,21 @@ namespace KBibTeX m_listViewWarnings->addColumn( i18n( "Message" ) ); m_listViewWarnings->setAllColumnsShowFocus( true ); layout->addMultiCellWidget( m_listViewWarnings, 3, 3, 0, 5 ); - connect( m_listViewWarnings, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( warningsExecute( TQListViewItem* ) ) ); + connect( m_listViewWarnings, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( warningsExecute( TQListViewItem* ) ) ); } else m_listViewWarnings = NULL; - connect( m_checkBoxEnableAll, SIGNAL( toggled( bool ) ), this, SLOT( slotEnableAllFields( ) ) ); - connect( m_comboBoxEntryType, SIGNAL( activated( int ) ), this, SLOT( slotEntryTypeChanged( ) ) ); - connect( m_pushButtonForceDefaultIdSuggestion, SIGNAL( toggled( bool ) ), this, SLOT( slotForceDefaultIdSuggestion() ) ); - connect( m_comboBoxEntryType, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotEntryTypeChanged() ) ); - connect( m_tabWidget, SIGNAL( currentChanged( TQWidget* ) ), this, SLOT( slotCurrentPageChanged( TQWidget* ) ) ); - connect( parent, SIGNAL( okClicked() ), this, SLOT( apply() ) ); - connect( m_menuIdSuggestions, SIGNAL( aboutToShow() ), this, SLOT( updateIdSuggestionsMenu() ) ); + connect( m_checkBoxEnableAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEnableAllFields( ) ) ); + connect( m_comboBoxEntryType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEntryTypeChanged( ) ) ); + connect( m_pushButtonForceDefaultIdSuggestion, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotForceDefaultIdSuggestion() ) ); + connect( m_comboBoxEntryType, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotEntryTypeChanged() ) ); + connect( m_tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotCurrentPageChanged( TQWidget* ) ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( apply() ) ); + connect( m_menuIdSuggestions, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateIdSuggestionsMenu() ) ); m_updateWarningsTimer = new TQTimer( this ); - connect( m_updateWarningsTimer, SIGNAL( timeout() ), this, SLOT( updateWarnings() ) ); + connect( m_updateWarningsTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateWarnings() ) ); if ( !m_isReadOnly ) m_updateWarningsTimer->start( 500 ); } @@ -548,7 +548,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( m_dlgParent->winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : m_dlgParent->width(); @@ -600,7 +600,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/entrywidget.h b/src/entrywidget.h index 29da6e7..cdbb9bd 100644 --- a/src/entrywidget.h +++ b/src/entrywidget.h @@ -48,7 +48,7 @@ namespace KBibTeX class EntryWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class EntryWidgetDialog; @@ -121,7 +121,7 @@ namespace KBibTeX class EntryWidgetDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EntryWidgetDialog( TQWidget *parent = 0, const char *name = 0, bool modal = true, const TQString &caption = TQString::null, int buttonMask = Ok | Apply | Cancel ) : KDialogBase( parent, name, modal, caption, buttonMask ) {/* nothing */}; ~EntryWidgetDialog() {/* nothing */}; diff --git a/src/entrywidgetauthor.h b/src/entrywidgetauthor.h index c05d31f..bb2581e 100644 --- a/src/entrywidgetauthor.h +++ b/src/entrywidgetauthor.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class EntryWidgetAuthor : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetAuthor( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetAuthor(); diff --git a/src/entrywidgetexternal.cpp b/src/entrywidgetexternal.cpp index 3f5230a..c470483 100644 --- a/src/entrywidgetexternal.cpp +++ b/src/entrywidgetexternal.cpp @@ -89,9 +89,9 @@ namespace KBibTeX void EntryWidgetExternal::reset( BibTeX::Entry *entry ) { - disconnect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - disconnect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - disconnect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); BibTeX::EntryField * field = entry->getField( BibTeX::EntryField::ftURL ); @@ -105,9 +105,9 @@ namespace KBibTeX updateGUI(); - connect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); } void EntryWidgetExternal::updateWarnings( BibTeX::Entry::EntryType entryType, TQListView *listViewWarnings ) @@ -226,14 +226,14 @@ namespace KBibTeX m_fieldLineEditURL->setFieldType( BibTeX::EntryField::ftURL ); gridLayout->addWidget( m_fieldLineEditURL, 0, 1 ); label->setBuddy( m_fieldLineEditURL ); - connect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonOpenURL = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenURL, 0, 2 ); m_pushButtonOpenURL->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenURL->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenURL, TQString( i18n( "Open %1" ) ).arg( i18n( "URL" ) ) ); - connect( m_pushButtonOpenURL, SIGNAL( clicked() ), this, SLOT( openURL() ) ); + connect( m_pushButtonOpenURL, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openURL() ) ); KURLLabel *urllabel = new KURLLabel( "http://www.doi.org/", TQString( "%1:" ).arg( i18n( "DOI" ) ), this ); TQToolTip::add( urllabel, i18n( "Digital Object Identifier" ) ); @@ -243,15 +243,15 @@ namespace KBibTeX m_fieldLineEditDoi->setFieldType( BibTeX::EntryField::ftDoi ); gridLayout->addWidget( m_fieldLineEditDoi, 1, 1 ); urllabel->setBuddy( m_fieldLineEditDoi ); - connect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( urllabel, SIGNAL( leftClickedURL( const TQString& ) ), this, SLOT( openURL( const TQString& ) ) ); + connect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), this, TQ_SLOT( openURL( const TQString& ) ) ); m_pushButtonOpenDoi = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenDoi, 1, 2 ); m_pushButtonOpenDoi->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenDoi->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenDoi, i18n( "Open DOI" ) ); - connect( m_pushButtonOpenDoi, SIGNAL( clicked() ), this, SLOT( openDoi() ) ); + connect( m_pushButtonOpenDoi, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openDoi() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "Local File" ) ), this ); gridLayout->addWidget( label, 2, 0 ); @@ -259,14 +259,14 @@ namespace KBibTeX m_fieldLineEditLocalFile->setFieldType( BibTeX::EntryField::ftLocalFile ); gridLayout->addWidget( m_fieldLineEditLocalFile, 2, 1 ); label->setBuddy( m_fieldLineEditLocalFile ); - connect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonOpenLocalFile = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenLocalFile, 2, 2 ); m_pushButtonOpenLocalFile->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenLocalFile->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenLocalFile, TQString( i18n( "Open %1" ) ).arg( i18n( "Local File" ) ) ); - connect( m_pushButtonOpenLocalFile, SIGNAL( clicked() ), this, SLOT( openLocalFile() ) ); + connect( m_pushButtonOpenLocalFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openLocalFile() ) ); TQWidget *container = new TQWidget( this ); TQHBoxLayout *containerLayout = new TQHBoxLayout( container ); @@ -291,7 +291,7 @@ namespace KBibTeX menu->insertItem( TQIconSet( SmallIcon( "folder" ) ), *it, i ); } m_pushButtonBrowseLocalFile->setPopup( menu ); - connect( menu, SIGNAL( activated( int ) ), this, SLOT( browseLocalFile( int ) ) ); + connect( menu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( browseLocalFile( int ) ) ); } } #include "entrywidgetexternal.moc" diff --git a/src/entrywidgetexternal.h b/src/entrywidgetexternal.h index da764c6..cb88bfc 100644 --- a/src/entrywidgetexternal.h +++ b/src/entrywidgetexternal.h @@ -35,7 +35,7 @@ namespace KBibTeX */ class EntryWidgetExternal : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetExternal( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetExternal(); diff --git a/src/entrywidgetkeyword.cpp b/src/entrywidgetkeyword.cpp index 8a40c71..ec79e4b 100644 --- a/src/entrywidgetkeyword.cpp +++ b/src/entrywidgetkeyword.cpp @@ -192,7 +192,7 @@ namespace KBibTeX { KeywordListViewItem * item = new KeywordListViewItem( m_listviewKeywords, TQString( i18n( "May only contain ASCII characters, in case of doubt keep English form", "NewKeyword%1" ) ).arg( ++m_numKeywords ), FALSE ); m_listviewKeywords->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditKeyword() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditKeyword() ) ); } void EntryWidgetKeyword::slotEditKeyword() @@ -231,30 +231,30 @@ namespace KBibTeX m_listviewKeywords->addColumn( i18n( "Origin" ) ); gridLayout->addMultiCellWidget( m_listviewKeywords, 0, 4, 0, 0 ); m_listviewKeywords->setAllColumnsShowFocus( TRUE ); - connect( m_listviewKeywords, SIGNAL( currentChanged( TQListViewItem* ) ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listviewKeywords, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listviewKeywords, SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), this, SLOT( slotKeywordRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( m_listviewKeywords, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listviewKeywords, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listviewKeywords, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), this, TQ_SLOT( slotKeywordRenamed( TQListViewItem*, const TQString&, int ) ) ); m_buttonNew = new TQPushButton( i18n( "keyword", "New" ), this ); m_buttonNew->setEnabled( !m_isReadOnly ); m_buttonNew->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); TQToolTip::add( m_buttonNew, i18n( "Add a new keyword to the list" ) ); gridLayout->addWidget( m_buttonNew, 0, 1 ); - connect( m_buttonNew, SIGNAL( clicked() ), this, SLOT( slotNewKeyword() ) ); + connect( m_buttonNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewKeyword() ) ); m_buttonEdit = new TQPushButton( i18n( "keyword", "Edit" ), this ); m_buttonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); TQToolTip::add( m_buttonEdit, i18n( "Edit the selected keyword" ) ); gridLayout->addWidget( m_buttonEdit, 1, 1 ); m_buttonEdit->setEnabled( FALSE ); - connect( m_buttonEdit, SIGNAL( clicked() ), this, SLOT( slotEditKeyword() ) ); + connect( m_buttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditKeyword() ) ); m_buttonToggleGlobal = new TQPushButton( i18n( "keyword", "Toggle &global" ), this ); m_buttonToggleGlobal->setIconSet( TQIconSet( SmallIcon( "package" ) ) ); TQToolTip::add( m_buttonToggleGlobal, i18n( "Add or remove the selected keyword to or from the global list" ) ); gridLayout->addWidget( m_buttonToggleGlobal, 2, 1 ); m_buttonToggleGlobal->setEnabled( FALSE ); - connect( m_buttonToggleGlobal, SIGNAL( clicked() ), this, SLOT( slotToggleGlobal() ) ); + connect( m_buttonToggleGlobal, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleGlobal() ) ); TQLabel *label = new TQLabel( i18n( "There is no need to delete keywords. Simply uncheck unwanted keywords and make them non-global.\nGlobal keywords can also be edited in the settings dialog." ), this ); label->setAlignment( TQLabel::WordBreak | TQLabel::AlignTop ); diff --git a/src/entrywidgetkeyword.h b/src/entrywidgetkeyword.h index 91e3f77..895784f 100644 --- a/src/entrywidgetkeyword.h +++ b/src/entrywidgetkeyword.h @@ -48,7 +48,7 @@ namespace KBibTeX */ class EntryWidgetKeyword : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetKeyword( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetKeyword(); diff --git a/src/entrywidgetmisc.h b/src/entrywidgetmisc.h index f06bc82..ca0360c 100644 --- a/src/entrywidgetmisc.h +++ b/src/entrywidgetmisc.h @@ -28,7 +28,7 @@ namespace KBibTeX class EntryWidgetMisc : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetMisc( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetMisc(); diff --git a/src/entrywidgetother.cpp b/src/entrywidgetother.cpp index 6fdc23b..1e2fd5c 100644 --- a/src/entrywidgetother.cpp +++ b/src/entrywidgetother.cpp @@ -176,12 +176,12 @@ namespace KBibTeX m_pushButtonAdd->setEnabled( FALSE ); m_pushButtonDelete->setEnabled( FALSE ); - connect( m_listViewFields, SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( fieldExecute( TQListViewItem* ) ) ); - connect( m_lineEditKey, SIGNAL( textChanged( const TQString& ) ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditValue, SIGNAL( textChanged( ) ), this, SLOT( updateGUI() ) ); - connect( m_pushButtonAdd, SIGNAL( clicked( ) ), this, SLOT( addClicked( ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked( ) ), this, SLOT( deleteClicked( ) ) ); - connect( m_pushButtonOpen, SIGNAL( clicked() ), this, SLOT( openClicked() ) ); + connect( m_listViewFields, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( fieldExecute( TQListViewItem* ) ) ); + connect( m_lineEditKey, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditValue, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( addClicked( ) ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( deleteClicked( ) ) ); + connect( m_pushButtonOpen, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openClicked() ) ); } void EntryWidgetOther::updateGUI() diff --git a/src/entrywidgetother.h b/src/entrywidgetother.h index 7829ae8..45531fb 100644 --- a/src/entrywidgetother.h +++ b/src/entrywidgetother.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class EntryWidgetOther : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetOther( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetOther(); diff --git a/src/entrywidgetpublication.cpp b/src/entrywidgetpublication.cpp index d68dcde..b23d2c8 100644 --- a/src/entrywidgetpublication.cpp +++ b/src/entrywidgetpublication.cpp @@ -471,7 +471,7 @@ namespace KBibTeX m_fieldLineEditCrossRef->setFieldType( BibTeX::EntryField::ftCrossRef ); label->setBuddy( m_fieldLineEditCrossRef ); gridLayout->addWidget( m_fieldLineEditCrossRef, 8, 1 ); - connect( m_fieldLineEditCrossRef, SIGNAL( textChanged() ), this, SLOT( slotSetCrossRefEntry() ) ); + connect( m_fieldLineEditCrossRef, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotSetCrossRefEntry() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "Organization" ) ), this ); gridLayout->addWidget( label, 0, 3 ); @@ -528,7 +528,7 @@ namespace KBibTeX m_fieldLineEditISBN ->setFieldType( BibTeX::EntryField::ftISBN ); label->setBuddy( m_fieldLineEditISBN ); innerLayout->addWidget( m_fieldLineEditISBN ); - connect( m_pushButtonISBN, SIGNAL( clicked() ), this, SLOT( slotOpenISBN() ) ); + connect( m_pushButtonISBN, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenISBN() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "ISSN" ) ), this ); gridLayout->addWidget( label, 7, 3 ); @@ -548,7 +548,7 @@ namespace KBibTeX for ( int i = 0; i < 12; i++ ) menuMonths->insertItem( BibTeX::Months[ i ], i ); m_pushButtonMonths->setPopup( menuMonths ); - connect( menuMonths, SIGNAL( activated( int ) ), this, SLOT( slotSetMonth( int ) ) ); + connect( menuMonths, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSetMonth( int ) ) ); } TQString EntryWidgetPublication::isbn() const diff --git a/src/entrywidgetpublication.h b/src/entrywidgetpublication.h index 9d5b2b7..f655afe 100644 --- a/src/entrywidgetpublication.h +++ b/src/entrywidgetpublication.h @@ -30,7 +30,7 @@ namespace KBibTeX class EntryWidgetPublication : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetPublication( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetPublication(); diff --git a/src/entrywidgetsource.cpp b/src/entrywidgetsource.cpp index 6f543e7..d0f11dd 100644 --- a/src/entrywidgetsource.cpp +++ b/src/entrywidgetsource.cpp @@ -154,7 +154,7 @@ namespace KBibTeX KPushButton *btnReset = new KPushButton( i18n( "Restore" ), this ); gridLayout->addWidget( btnReset, 1, 1 ); - connect( btnReset, SIGNAL( clicked() ), this, SLOT( restore() ) ); + connect( btnReset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restore() ) ); } } diff --git a/src/entrywidgetsource.h b/src/entrywidgetsource.h index aff579f..0656163 100644 --- a/src/entrywidgetsource.h +++ b/src/entrywidgetsource.h @@ -32,7 +32,7 @@ namespace KBibTeX */ class EntryWidgetSource : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetSource( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetSource(); diff --git a/src/entrywidgettab.h b/src/entrywidgettab.h index e8c24f6..c214240 100644 --- a/src/entrywidgettab.h +++ b/src/entrywidgettab.h @@ -33,7 +33,7 @@ namespace KBibTeX class EntryWidgetTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EntryWidgetTab( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetTab(); diff --git a/src/entrywidgettitle.h b/src/entrywidgettitle.h index c233556..4035e23 100644 --- a/src/entrywidgettitle.h +++ b/src/entrywidgettitle.h @@ -28,7 +28,7 @@ namespace KBibTeX class EntryWidgetTitle : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetTitle( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetTitle(); diff --git a/src/entrywidgetuserdefined.h b/src/entrywidgetuserdefined.h index 6affcf8..27b488b 100644 --- a/src/entrywidgetuserdefined.h +++ b/src/entrywidgetuserdefined.h @@ -30,7 +30,7 @@ namespace KBibTeX */ class EntryWidgetUserDefined : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetUserDefined( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetUserDefined(); diff --git a/src/fieldlineedit.cpp b/src/fieldlineedit.cpp index 910ea12..43e99f1 100644 --- a/src/fieldlineedit.cpp +++ b/src/fieldlineedit.cpp @@ -227,7 +227,7 @@ namespace KBibTeX m_pushButtonString->setToggleButton( TRUE ); TQToolTip::add( m_pushButtonString, TQString( i18n( "Set '%1' to be a string key" ) ).arg( m_caption ) ); m_pushButtonString->setEnabled( !m_isReadOnly ); - connect( m_pushButtonString, SIGNAL( clicked() ), this, SLOT( slotStringToggled() ) ); + connect( m_pushButtonString, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStringToggled() ) ); if ( subname != NULL ) { @@ -238,7 +238,7 @@ namespace KBibTeX m_pushButtonComplex->setIconSet( TQIconSet( SmallIcon( "format-justify-left" ) ) ); m_pushButtonComplex->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonComplex, TQString( i18n( "Edit '%1' as a concatenated value" ) ).arg( m_caption ) ); - connect( m_pushButtonComplex, SIGNAL( clicked() ), this, SLOT( slotComplexClicked() ) ); + connect( m_pushButtonComplex, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotComplexClicked() ) ); TQGridLayout * layout = NULL; switch ( m_inputType ) @@ -353,15 +353,15 @@ namespace KBibTeX { case itSingleLine: if ( enabled ) - connect( m_lineEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( ) ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( ) ) ); else - disconnect( m_lineEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( ) ) ); + disconnect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( ) ) ); break; case itMultiLine: if ( enabled ) - connect( m_textEdit, SIGNAL( textChanged( ) ), this, SLOT( slotTextChanged( ) ) ); + connect( m_textEdit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( slotTextChanged( ) ) ); else - disconnect( m_textEdit, SIGNAL( textChanged( ) ), this, SLOT( slotTextChanged( ) ) ); + disconnect( m_textEdit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( slotTextChanged( ) ) ); break; } } diff --git a/src/fieldlineedit.h b/src/fieldlineedit.h index f8cd7ff..51eb05a 100644 --- a/src/fieldlineedit.h +++ b/src/fieldlineedit.h @@ -34,7 +34,7 @@ namespace KBibTeX { class FieldLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum InputType {itSingleLine, itMultiLine}; enum ErrorType {etNoError, etInvalidStringKey}; diff --git a/src/fieldlistview.cpp b/src/fieldlistview.cpp index 8b0931b..32bbf4c 100644 --- a/src/fieldlistview.cpp +++ b/src/fieldlistview.cpp @@ -172,7 +172,7 @@ namespace KBibTeX void FieldListView::updateGUI() { - disconnect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + disconnect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); if ( m_value != NULL && !m_isComplex ) { bool isElementSelected = m_listViewElements->selectedItem() != NULL; @@ -194,7 +194,7 @@ namespace KBibTeX m_listViewElements->setEnabled( FALSE ); m_checkBoxEtAl->setEnabled( FALSE ); } - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } void FieldListView::slotAdd() @@ -204,7 +204,7 @@ namespace KBibTeX TDEListViewItem * item = new TDEListViewItem( m_listViewElements, m_listViewElements->lastItem(), TQString( "%1%2" ).arg( m_prefixNew ).arg( ++m_newValueCounter ) ); m_listViewElements->setSelected( item, TRUE ); updateGUI(); - TQTimer::singleShot( 100, this, SLOT( slotEdit() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEdit() ) ); } } @@ -308,51 +308,51 @@ namespace KBibTeX m_listViewElements->header() ->setClickEnabled( FALSE ); m_listViewElements->header() ->setStretchEnabled( TRUE, 0 ); - connect( m_listViewElements, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( doubleClicked( TQListViewItem * ) ), this, SLOT( slotListViewDoubleClicked( TQListViewItem * ) ) ); - connect( m_listViewElements, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, SLOT( slotItemRenamed( TQListViewItem*, int, const TQString& ) ) ); + connect( m_listViewElements, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotListViewDoubleClicked( TQListViewItem * ) ) ); + connect( m_listViewElements, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, TQ_SLOT( slotItemRenamed( TQListViewItem*, int, const TQString& ) ) ); m_pushButtonAdd = new TQPushButton( i18n( "Add" ), this ); layout->addWidget( m_pushButtonAdd, 0, 1 ); m_pushButtonAdd->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); - connect( m_pushButtonAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); TQToolTip::add( m_pushButtonAdd, TQString( i18n( "Add new '%1' item (Ctrl+A)" ) ).arg( m_caption ) ); m_pushButtonEdit = new TQPushButton( i18n( "Edit" ), this ); layout->addWidget( m_pushButtonEdit, 1, 1 ); m_pushButtonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); - connect( m_pushButtonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); + connect( m_pushButtonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); TQToolTip::add( m_pushButtonEdit, TQString( i18n( "Edit current '%1' item (F2)" ) ).arg( m_caption ) ); m_pushButtonDelete = new TQPushButton( i18n( "Delete" ), this ); layout->addWidget( m_pushButtonDelete, 2, 1 ); m_pushButtonDelete->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); TQToolTip::add( m_pushButtonDelete, TQString( i18n( "Delete current '%1' item (Del)" ) ).arg( m_caption ) ); m_pushButtonUp = new TQPushButton( i18n( "Up" ), this ); layout->addWidget( m_pushButtonUp, 3, 1 ); m_pushButtonUp->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); TQToolTip::add( m_pushButtonUp, TQString( i18n( "Move current '%1' item up (Ctrl+Up)" ) ).arg( m_caption ) ); m_pushButtonDown = new TQPushButton( i18n( "Down" ), this ); layout->addWidget( m_pushButtonDown, 4, 1 ); m_pushButtonDown->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); TQToolTip::add( m_pushButtonDown, TQString( i18n( "Move current '%1' item down (Ctrl+Down)" ) ).arg( m_caption ) ); m_pushButtonComplexEdit = new TQPushButton( i18n( "Complex..." ), this ); layout->addWidget( m_pushButtonComplexEdit, 6, 1 ); m_pushButtonComplexEdit->setIconSet( TQIconSet( SmallIcon( "format-justify-left" ) ) ); - connect( m_pushButtonComplexEdit, SIGNAL( clicked() ), this, SLOT( slotComplex() ) ); + connect( m_pushButtonComplexEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotComplex() ) ); TQToolTip::add( m_pushButtonComplexEdit, TQString( i18n( "Edit current '%1' item as a concatenated string (Ctrl+Alt+C)" ) ).arg( m_caption ) ); m_checkBoxEtAl = new TQCheckBox( i18n( "... and others (et al.)" ), this ); layout->addMultiCellWidget( m_checkBoxEtAl, 7, 7, 0, 1 ); - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } void FieldListView::apply() @@ -403,7 +403,7 @@ namespace KBibTeX void FieldListView::reset() { - disconnect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + disconnect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); m_listViewElements->clear(); m_checkBoxEtAl->setChecked( FALSE ); @@ -439,7 +439,7 @@ namespace KBibTeX kdDebug() << "Don't know how to handle entries of type " << BibTeX::EntryField::fieldTypeToString( m_fieldType ) << endl; } - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } bool FieldListView::isSimple() diff --git a/src/fieldlistview.h b/src/fieldlistview.h index e6e2e58..95d9518 100644 --- a/src/fieldlistview.h +++ b/src/fieldlistview.h @@ -39,7 +39,7 @@ namespace KBibTeX */ class FieldListView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FieldListView( const TQString& caption, const TQString& prefixNew, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~FieldListView(); @@ -52,7 +52,7 @@ namespace BibTeX class File : public TQObject { - Q_OBJECT + TQ_OBJECT friend class FileExporterXML; friend class FileExporterBibTeX; diff --git a/src/fileexporter.h b/src/fileexporter.h index 3457878..306606a 100644 --- a/src/fileexporter.h +++ b/src/fileexporter.h @@ -37,7 +37,7 @@ namespace BibTeX */ class FileExporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileExporter(); ~FileExporter(); diff --git a/src/fileexporterbibutils.cpp b/src/fileexporterbibutils.cpp index 68af9c7..2a5fffa 100644 --- a/src/fileexporterbibutils.cpp +++ b/src/fileexporterbibutils.cpp @@ -101,9 +101,9 @@ namespace BibTeX m_processBuffer->open( IO_WriteOnly ); m_waiting = true; m_process = new TQProcess( TQStringList::split( ' ', "bib2xml -i utf8" ) ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); m_process->start(); if ( m_process->isRunning() ) @@ -178,9 +178,9 @@ namespace BibTeX if ( m_process != NULL ) { - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); if ( m_process->start() ) { diff --git a/src/fileexporterbibutils.h b/src/fileexporterbibutils.h index a691747..8b37d53 100644 --- a/src/fileexporterbibutils.h +++ b/src/fileexporterbibutils.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileExporterBibUtils : public FileExporter { - Q_OBJECT + TQ_OBJECT public: FileExporterBibUtils( BibTeX::File::FileFormat outputFormat ); ~FileExporterBibUtils(); diff --git a/src/fileexporterexternal.cpp b/src/fileexporterexternal.cpp index fc02819..d8d7180 100644 --- a/src/fileexporterexternal.cpp +++ b/src/fileexporterexternal.cpp @@ -108,10 +108,10 @@ namespace BibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); process = new TQProcess( args ); - connect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); + connect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); if ( process->start() ) { @@ -136,10 +136,10 @@ namespace BibTeX result = process->normalExit(); } - disconnect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); - disconnect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); + disconnect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( process ); process = NULL; delete writeTo; diff --git a/src/fileexporterexternal.h b/src/fileexporterexternal.h index 1942671..04cea4f 100644 --- a/src/fileexporterexternal.h +++ b/src/fileexporterexternal.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileExporterExternal : public FileExporter { - Q_OBJECT + TQ_OBJECT public: enum Exporter { exporterNone = 0, exporterXSLT = 1, exporterBib2XHTML = 2, exporterBibTeX2HTML = 3, exporterBibConv = 4 }; diff --git a/src/fileexportertoolchain.cpp b/src/fileexportertoolchain.cpp index 6e96208..5450cc5 100644 --- a/src/fileexportertoolchain.cpp +++ b/src/fileexportertoolchain.cpp @@ -65,9 +65,9 @@ namespace BibTeX m_process = new TQProcess( args ); m_process->setWorkingDirectory( workingDir ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); if ( m_process->start() ) { @@ -92,9 +92,9 @@ namespace BibTeX errorLog->append( TQString( "Process '%1' was not started." ).arg( args.join( " " ) ) ); - disconnect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( m_process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( m_process ); m_process = NULL; diff --git a/src/fileexportertoolchain.h b/src/fileexportertoolchain.h index 16be8eb..1fdb497 100644 --- a/src/fileexportertoolchain.h +++ b/src/fileexportertoolchain.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileExporterToolchain : public FileExporter { - Q_OBJECT + TQ_OBJECT public: FileExporterToolchain(); ~FileExporterToolchain(); diff --git a/src/fileimporter.h b/src/fileimporter.h index e18425e..e5c4c6e 100644 --- a/src/fileimporter.h +++ b/src/fileimporter.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileImporter(); ~FileImporter(); diff --git a/src/fileimporterbibutils.cpp b/src/fileimporterbibutils.cpp index 169aa73..ef8f0e8 100644 --- a/src/fileimporterbibutils.cpp +++ b/src/fileimporterbibutils.cpp @@ -127,9 +127,9 @@ namespace BibTeX if ( m_process != NULL ) { m_waiting = true; - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); m_process->start(); if ( m_process->isRunning() ) @@ -181,9 +181,9 @@ namespace BibTeX m_waiting = true; m_process = new TQProcess( TQStringList::split( ' ', "xml2bib -i utf8 -o utf8 -sk" ) ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); if ( m_process->start() ) { diff --git a/src/fileimporterbibutils.h b/src/fileimporterbibutils.h index 2fc46d1..541b341 100644 --- a/src/fileimporterbibutils.h +++ b/src/fileimporterbibutils.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileImporterBibUtils : public FileImporter { - Q_OBJECT + TQ_OBJECT public: FileImporterBibUtils( BibTeX::File::FileFormat inputFormat ); ~FileImporterBibUtils(); diff --git a/src/fileimporterexternal.cpp b/src/fileimporterexternal.cpp index d962d0a..e1d196b 100644 --- a/src/fileimporterexternal.cpp +++ b/src/fileimporterexternal.cpp @@ -84,10 +84,10 @@ namespace BibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); process = new TQProcess( args ); - connect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); + connect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); if ( process->start() ) { @@ -109,10 +109,10 @@ namespace BibTeX result = process->normalExit(); } - disconnect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); - disconnect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); + disconnect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( process ); process = NULL; delete writeTo; diff --git a/src/fileimporterexternal.h b/src/fileimporterexternal.h index d91f5b6..e341f99 100644 --- a/src/fileimporterexternal.h +++ b/src/fileimporterexternal.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileImporterExternal : public FileImporter { - Q_OBJECT + TQ_OBJECT public: enum Importer {importerNone = 0, importerBibConv = 4}; diff --git a/src/findduplicates.cpp b/src/findduplicates.cpp index 00e7240..ed0a4ba 100644 --- a/src/findduplicates.cpp +++ b/src/findduplicates.cpp @@ -56,7 +56,7 @@ namespace KBibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); KProgressDialog *progDlg = new KProgressDialog( parent, NULL, i18n( "Find Duplicates" ), i18n( "Searching for duplicates..." ), true ); - connect( progDlg, SIGNAL( cancelClicked() ), this, SLOT( slotCancel() ) ); + connect( progDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); progDlg->progressBar()->setTotalSteps( len ); determineDistances( file, distVector, mapElementToIndex, progDlg ); diff --git a/src/findduplicates.h b/src/findduplicates.h index 27228d3..26d08c2 100644 --- a/src/findduplicates.h +++ b/src/findduplicates.h @@ -33,7 +33,7 @@ namespace KBibTeX */ class FindDuplicates : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<BibTeX::Element*> DuplicateClique; typedef TQValueList<DuplicateClique> DuplicateCliqueList; diff --git a/src/idsuggestionswidget.cpp b/src/idsuggestionswidget.cpp index ee7f123..5de293b 100644 --- a/src/idsuggestionswidget.cpp +++ b/src/idsuggestionswidget.cpp @@ -63,9 +63,9 @@ namespace KBibTeX layout->addWidget( m_pushButtonDown ); layout->addWidget( m_pushButtonDel ); layout->addStretch( 10 ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); - connect( m_pushButtonDel, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); + connect( m_pushButtonDel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); return container; } @@ -133,7 +133,7 @@ namespace KBibTeX case 'z': m_comboBoxWhichAuthors->setCurrentItem( 2 ); break; default: m_comboBoxWhichAuthors->setCurrentItem( 0 ); } - connect( m_comboBoxWhichAuthors, SIGNAL( activated( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxWhichAuthors, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( modified() ) ); struct IdSuggestionTokenInfo info = IdSuggestions::evalToken( text.mid( 1 ) ); @@ -151,7 +151,7 @@ namespace KBibTeX m_comboBoxCasing->setCurrentItem( 2 ); else m_comboBoxCasing->setCurrentItem( 0 ); - connect( m_comboBoxCasing, SIGNAL( activated( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxCasing, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Only first letters:" ), this ); layout->addWidget( label, 3, 0 ); @@ -163,7 +163,7 @@ namespace KBibTeX m_spinBoxLen->setSpecialValueText( i18n( "Complete name" ) ); m_spinBoxLen->setValue( info.len > 9 ? 0 : info.len ); m_spinBoxLen->setMinimumWidth( m_spinBoxLen->fontMetrics().width( i18n( "Complete name" ) ) + 32 ); - connect( m_spinBoxLen, SIGNAL( valueChanged( int ) ), SIGNAL( modified() ) ); + connect( m_spinBoxLen, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Text between authors:" ), this ); layout->addWidget( label, 4, 0 ); @@ -171,7 +171,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 4, 1 ); m_lineEditInBetween->setText( info.inBetween ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setRowStretch( 5, 1 ); layout->setColStretch( 1, 1 ); @@ -214,7 +214,7 @@ namespace KBibTeX m_checkBoxRemoveSmallWords = new TQCheckBox( i18n( "Remove small words" ), this ); layout->addMultiCellWidget( m_checkBoxRemoveSmallWords, 1, 1, 0, 1 ); m_checkBoxRemoveSmallWords->setChecked( text[0] == 'T' ); - connect( m_checkBoxRemoveSmallWords, SIGNAL( toggled( bool ) ), SIGNAL( modified() ) ); + connect( m_checkBoxRemoveSmallWords, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( modified() ) ); struct IdSuggestionTokenInfo info = IdSuggestions::evalToken( text.mid( 1 ) ); @@ -232,7 +232,7 @@ namespace KBibTeX m_comboBoxCasing->setCurrentItem( 2 ); else m_comboBoxCasing->setCurrentItem( 0 ); - connect( m_comboBoxCasing, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxCasing, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Only first letters:" ), this ); layout->addWidget( label, 3, 0 ); @@ -244,7 +244,7 @@ namespace KBibTeX m_spinBoxLen->setSpecialValueText( i18n( "Complete title" ) ); m_spinBoxLen->setValue( info.len > 9 ? 0 : info.len ); m_spinBoxLen->setMinimumWidth( m_spinBoxLen->fontMetrics().width( i18n( "Complete title" ) ) + 32 ); - connect( m_spinBoxLen, SIGNAL( valueChanged( int ) ), SIGNAL( modified() ) ); + connect( m_spinBoxLen, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Text between words:" ), this ); layout->addWidget( label, 4, 0 ); @@ -252,7 +252,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 4, 1 ); m_lineEditInBetween->setText( info.inBetween ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setRowStretch( 5, 1 ); layout->setColStretch( 1, 1 ); @@ -294,7 +294,7 @@ namespace KBibTeX m_comboBoxDigits->insertItem( i18n( "2 digits" ) ); m_comboBoxDigits->insertItem( i18n( "4 digits" ) ); m_comboBoxDigits->setCurrentItem( text[0] == 'y' ? 0 : 1 ); - connect( m_comboBoxDigits, SIGNAL( activated( int ) ), SIGNAL( modified() ) ); + connect( m_comboBoxDigits, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) ); layout->setColStretch( 1, 1 ); layout->setRowStretch( 2, 1 ); @@ -327,7 +327,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 1, 1 ); m_lineEditInBetween->setText( text.mid( 1 ) ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setColStretch( 1, 1 ); layout->setRowStretch( 2, 1 ); @@ -428,9 +428,9 @@ namespace KBibTeX if ( component != NULL ) { ++m_componentCount; - connect( component, SIGNAL( moved() ), this, SLOT( updateGUI() ) ); - connect( component, SIGNAL( deleted() ), this, SLOT( componentDeleted() ) ); - connect( component, SIGNAL( modified() ), this, SLOT( updateExample() ) ); + connect( component, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateGUI() ) ); + connect( component, TQ_SIGNAL( deleted() ), this, TQ_SLOT( componentDeleted() ) ); + connect( component, TQ_SIGNAL( modified() ), this, TQ_SLOT( updateExample() ) ); } } @@ -484,7 +484,7 @@ namespace KBibTeX addMenu->insertItem( i18n( "Year" ), 2 ); addMenu->insertItem( i18n( "Title" ), 3 ); addMenu->insertItem( i18n( "Text" ), 4 ); - connect( addMenu, SIGNAL( activated( int ) ), this, SLOT( addMenuActivated( int ) ) ); + connect( addMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( addMenuActivated( int ) ) ); m_pushButtonAdd->setPopup( addMenu ); } @@ -506,9 +506,9 @@ namespace KBibTeX comp->show(); - connect( comp, SIGNAL( moved() ), this, SLOT( updateGUI() ) ); - connect( comp, SIGNAL( deleted() ), this, SLOT( componentDeleted() ) ); - connect( comp, SIGNAL( modified() ), this, SLOT( updateExample() ) ); + connect( comp, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateGUI() ) ); + connect( comp, TQ_SIGNAL( deleted() ), this, TQ_SLOT( componentDeleted() ) ); + connect( comp, TQ_SIGNAL( modified() ), this, TQ_SLOT( updateExample() ) ); m_listOfComponents->adjustSize(); m_scrollViewComponents->ensureVisible( 10, m_listOfComponents->height() - 2 ); updateGUI(); diff --git a/src/idsuggestionswidget.h b/src/idsuggestionswidget.h index 0f8b5cb..43c6794 100644 --- a/src/idsuggestionswidget.h +++ b/src/idsuggestionswidget.h @@ -34,7 +34,7 @@ namespace KBibTeX { class IdSuggestionComponent: public TQFrame { - Q_OBJECT + TQ_OBJECT public: IdSuggestionComponent( const TQString& title, TQWidget *parent ); virtual TQString text() const = 0; @@ -105,7 +105,7 @@ namespace KBibTeX class IdSuggestionsScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: IdSuggestionsScrollView( TQWidget *parent, const char*name = NULL ); ~IdSuggestionsScrollView(); @@ -124,7 +124,7 @@ namespace KBibTeX */ class IdSuggestionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~IdSuggestionsWidget(); int numComponents(); diff --git a/src/kbibtex_part.cpp b/src/kbibtex_part.cpp index fdbb904..2ea7041 100644 --- a/src/kbibtex_part.cpp +++ b/src/kbibtex_part.cpp @@ -101,7 +101,7 @@ KBibTeXPart::KBibTeXPart( TQWidget *parentWidget, const char *widgetName, // read configuration readSettings(); - TQTimer::singleShot( 100, this, SLOT( slotDeferredInitialization() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotDeferredInitialization() ) ); } KBibTeXPart::~KBibTeXPart() @@ -116,12 +116,12 @@ void KBibTeXPart::setReadWrite( bool rw ) { if ( rw ) { - connect( m_documentWidget, SIGNAL( modified( ) ), this, SLOT( setModified( ) ) ); + connect( m_documentWidget, TQ_SIGNAL( modified( ) ), this, TQ_SLOT( setModified( ) ) ); m_actionEditElement->setText( i18n( "&Edit" ) ); } else { - disconnect( m_documentWidget, SIGNAL( modified( ) ), this, SLOT( setModified( ) ) ); + disconnect( m_documentWidget, TQ_SIGNAL( modified( ) ), this, TQ_SLOT( setModified( ) ) ); m_actionEditElement->setText( i18n( "&View" ) ); } ReadWritePart::setReadWrite( rw ); @@ -424,47 +424,47 @@ void KBibTeXPart::setupActions() { if ( isReadWrite() ) { - KStdAction::save( this, SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) ); - KStdAction::saveAs( this, SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) ); + KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) ); } - m_actionFileStatistics = new TDEAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" ); - m_actionFileFindDups = new TDEAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" ); - m_actionFileExport = new TDEAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, SLOT( slotFileExport() ), actionCollection(), "file_export" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, TQ_SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileFindDups = new TDEAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, TQ_SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" ); + m_actionFileExport = new TDEAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, TQ_SLOT( slotFileExport() ), actionCollection(), "file_export" ); m_actionFileExport->setToolTip( i18n( "Export to a different file format" ) ); - m_actionFileMerge = new TDEAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, SLOT( slotFileMerge() ), actionCollection(), "file_merge" ); + m_actionFileMerge = new TDEAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, TQ_SLOT( slotFileMerge() ), actionCollection(), "file_merge" ); m_actionFileMerge->setToolTip( i18n( "Merge BibTeX entries from another file" ) ); - m_actionEditCut = KStdAction::cut( m_documentWidget, SLOT( cutElements() ), actionCollection() ); + m_actionEditCut = KStdAction::cut( m_documentWidget, TQ_SLOT( cutElements() ), actionCollection() ); m_actionEditCut->setToolTip( i18n( "Cut the selected BibTeX elements to the clipboard" ) ); m_actionEditCut->setEnabled( FALSE ); - m_actionEditCopy = KStdAction::copy( m_documentWidget, SLOT( copyElements() ), actionCollection() ); + m_actionEditCopy = KStdAction::copy( m_documentWidget, TQ_SLOT( copyElements() ), actionCollection() ); m_actionEditCopy->setToolTip( i18n( "Copy the selected BibTeX elements to the clipboard" ) ); m_actionEditCopy->setEnabled( FALSE ); - m_actionEditUndo = KStdAction::undo( m_documentWidget, SLOT( undoEditor() ), actionCollection() ); - connect( m_documentWidget, SIGNAL( undoChanged( bool ) ), this, SLOT( slotUndoChanged( bool ) ) ); - m_actionEditCopyRef = new TDEAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, SLOT( copyRefElements() ), actionCollection(), "edit_copyref" ); + m_actionEditUndo = KStdAction::undo( m_documentWidget, TQ_SLOT( undoEditor() ), actionCollection() ); + connect( m_documentWidget, TQ_SIGNAL( undoChanged( bool ) ), this, TQ_SLOT( slotUndoChanged( bool ) ) ); + m_actionEditCopyRef = new TDEAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, TQ_SLOT( copyRefElements() ), actionCollection(), "edit_copyref" ); m_actionEditCopyRef->setToolTip( i18n( "Copy a reference of the selected BibTeX elements to the clipboard" ) ); m_actionEditCopyRef->setEnabled( FALSE ); - m_actionEditPaste = KStdAction::paste( m_documentWidget, SLOT( pasteElements() ), actionCollection() ); + m_actionEditPaste = KStdAction::paste( m_documentWidget, TQ_SLOT( pasteElements() ), actionCollection() ); m_actionEditPaste->setToolTip( i18n( "Paste BibTeX elements from the clipboard" ) ); - m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, SLOT( selectAll() ), actionCollection() ); + m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, TQ_SLOT( selectAll() ), actionCollection() ); m_actionEditSelectAll->setToolTip( i18n( "Select all BibTeX elements" ) ); - m_actionElementSendToLyX = new TDEAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" ); + m_actionElementSendToLyX = new TDEAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, TQ_SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" ); m_actionElementSendToLyX->setToolTip( i18n( "Send a reference of the selected BibTeX elements to LyX" ) ); m_actionElementSendToLyX->setEnabled( FALSE ); - m_actionEditFind = KStdAction::find( m_documentWidget, SLOT( find() ), actionCollection() ); + m_actionEditFind = KStdAction::find( m_documentWidget, TQ_SLOT( find() ), actionCollection() ); m_actionEditFind->setToolTip( i18n( "Find text" ) ); - m_actionEditFindNext = KStdAction::findNext( m_documentWidget, SLOT( findNext() ), actionCollection() ); + m_actionEditFindNext = KStdAction::findNext( m_documentWidget, TQ_SLOT( findNext() ), actionCollection() ); m_actionEditFindNext->setToolTip( i18n( "Find next occurrence" ) ); m_actionEditFind->setEnabled( FALSE ); m_actionEditFindNext->setEnabled( FALSE ); - m_actionSearchOnlineDatabases = new TDEAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" ); + m_actionSearchOnlineDatabases = new TDEAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, TQ_SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" ); m_actionSearchOnlineDatabases->setToolTip( i18n( "Search online databases to import bibliography data" ) ); m_actionMenuSearchWebsites = new TDEActionMenu( i18n( "Search Document Online" ), actionCollection(), "search_document_online" ); m_actionMenuSearchWebsites->setToolTip( i18n( "Search websites for the selected BibTeX element" ) ); - connect( m_actionMenuSearchWebsites->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotSearchWebsites( int ) ) ); + connect( m_actionMenuSearchWebsites->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSearchWebsites( int ) ) ); m_actionMenuSearchWebsites->setEnabled( FALSE ); m_actionViewShowColumns = new TDEActionMenu( i18n( "&Show Columns" ), actionCollection(), "view_showcolumns" ); @@ -472,63 +472,63 @@ void KBibTeXPart::setupActions() m_actionViewDocument = new TDEActionMenu( i18n( "View Document" ), actionCollection(), "view_document" ); m_actionViewDocument->setToolTip( i18n( "View the documents associated with this BibTeX entry" ) ); m_actionViewDocument->setEnabled( FALSE ); - m_actionViewFirstDocument = new TDEAction( i18n( "View Primary Document" ), 0, m_documentWidget, SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" ); + m_actionViewFirstDocument = new TDEAction( i18n( "View Primary Document" ), 0, m_documentWidget, TQ_SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" ); m_actionViewFirstDocument->setShortcut( TQt::Key_F4 ); - m_actionViewDocumentOnlineRef = new TDEAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" ); + m_actionViewDocumentOnlineRef = new TDEAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, TQ_SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" ); m_actionViewDocumentOnlineRef->setShortcut( TQt::Key_F5 ); m_actionAssignKeywords = new TDEActionMenu( i18n( "Assign Keywords" ), actionCollection(), "assign_keywords" ); m_actionAssignKeywords->setToolTip( i18n( "Assign keywords to this entry" ) ); m_actionAssignKeywords->setEnabled( FALSE ); - m_actionNormalizeIds = new TDEAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" ); + m_actionNormalizeIds = new TDEAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, TQ_SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" ); m_actionNormalizeIds->setToolTip( i18n( "Set entry ids as specified in the id suggestion settings" ) ); m_actionNormalizeIds->setEnabled( FALSE ); - m_actionPreferences = KStdAction::preferences( this, SLOT( slotPreferences() ), actionCollection() ); + m_actionPreferences = KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), actionCollection() ); m_actionPreferences->setToolTip( i18n( "Configure KBibTeX" ) ); - TDEAction *actionSourceEditor = new TDEAction( i18n( "Configure Source View..." ), 0, m_documentWidget, SLOT( configureEditor() ), actionCollection(), "options_configure_editor" ); + TDEAction *actionSourceEditor = new TDEAction( i18n( "Configure Source View..." ), 0, m_documentWidget, TQ_SLOT( configureEditor() ), actionCollection(), "options_configure_editor" ); actionSourceEditor ->setToolTip( i18n( "Configure the Source Editor" ) ); - ( new TDEAction( i18n( "Article" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) ); - ( new TDEAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) ); - ( new TDEAction( i18n( "Booklet" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) ); - ( new TDEAction( i18n( "Electronic (IEEE)" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) ); - ( new TDEAction( i18n( "InBook" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) ); - ( new TDEAction( i18n( "InCollection" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) ); - ( new TDEAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) ); - ( new TDEAction( i18n( "Manual" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) ); - ( new TDEAction( i18n( "MastersThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) ); - ( new TDEAction( i18n( "Misc" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) ); - ( new TDEAction( i18n( "PhDThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) ); - ( new TDEAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) ); - ( new TDEAction( i18n( "TechReport" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) ); - ( new TDEAction( i18n( "Unpublished" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) ); - ( new TDEAction( i18n( "Preamble" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) ); - ( new TDEAction( i18n( "Comment" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) ); - ( new TDEAction( i18n( "Macro" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) ); - - m_actionEditElement = new TDEAction( i18n( "&Edit" ), 0, m_documentWidget, SLOT( editElement() ), actionCollection(), "element_edit" ); + ( new TDEAction( i18n( "Article" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) ); + ( new TDEAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) ); + ( new TDEAction( i18n( "Booklet" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) ); + ( new TDEAction( i18n( "Electronic (IEEE)" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) ); + ( new TDEAction( i18n( "InBook" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) ); + ( new TDEAction( i18n( "InCollection" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) ); + ( new TDEAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) ); + ( new TDEAction( i18n( "Manual" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) ); + ( new TDEAction( i18n( "MastersThesis" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) ); + ( new TDEAction( i18n( "Misc" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) ); + ( new TDEAction( i18n( "PhDThesis" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) ); + ( new TDEAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) ); + ( new TDEAction( i18n( "TechReport" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) ); + ( new TDEAction( i18n( "Unpublished" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) ); + ( new TDEAction( i18n( "Preamble" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) ); + ( new TDEAction( i18n( "Comment" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) ); + ( new TDEAction( i18n( "Macro" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) ); + + m_actionEditElement = new TDEAction( i18n( "&Edit" ), 0, m_documentWidget, TQ_SLOT( editElement() ), actionCollection(), "element_edit" ); m_actionEditElement->setToolTip( i18n( "Edit the selected BibTeX element" ) ); m_actionEditElement->setEnabled( FALSE ); - m_actionDeleteElement = new TDEAction( i18n( "&Delete" ), 0, m_documentWidget, SLOT( deleteElements() ), actionCollection(), "element_delete" ); + m_actionDeleteElement = new TDEAction( i18n( "&Delete" ), 0, m_documentWidget, TQ_SLOT( deleteElements() ), actionCollection(), "element_delete" ); m_actionDeleteElement->setToolTip( i18n( "Delete the selected BibTeX elements" ) ); m_actionDeleteElement->setEnabled( FALSE ); - m_actionShowComments = new TDEToggleAction( i18n( "Show &Comments" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" ); + m_actionShowComments = new TDEToggleAction( i18n( "Show &Comments" ), 0, this, TQ_SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" ); m_actionShowComments->setToolTip( i18n( "Show the comments of a BibTeX document" ) ); - m_actionShowMacros = new TDEToggleAction( i18n( "Show &Macros" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" ); + m_actionShowMacros = new TDEToggleAction( i18n( "Show &Macros" ), 0, this, TQ_SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" ); m_actionShowMacros->setToolTip( i18n( "Show the macros of a BibTeX document" ) ); - m_actionUseInPipe = new TDEToggleAction( i18n( "Accept input from other programs" ), 0, this , SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" ); + m_actionUseInPipe = new TDEToggleAction( i18n( "Accept input from other programs" ), 0, this , TQ_SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" ); - connect( m_documentWidget, SIGNAL( listViewSelectionChanged( int ) ), this, SLOT( slotUpdateMenu( int ) ) ); + connect( m_documentWidget, TQ_SIGNAL( listViewSelectionChanged( int ) ), this, TQ_SLOT( slotUpdateMenu( int ) ) ); if ( m_mainWindow != NULL ) { KStatusBar * statusBar = m_mainWindow->statusBar(); if ( statusBar != NULL ) { - connect( actionCollection(), SIGNAL( actionStatusText( const TQString & ) ), statusBar, SLOT( message( const TQString & ) ) ); - connect( actionCollection(), SIGNAL( clearStatusText() ), statusBar, SLOT( clear() ) ); + connect( actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), statusBar, TQ_SLOT( message( const TQString & ) ) ); + connect( actionCollection(), TQ_SIGNAL( clearStatusText() ), statusBar, TQ_SLOT( clear() ) ); } } @@ -695,7 +695,7 @@ void KBibTeXPart::slotDeferredInitialization() KMessageBox::sorry( widget(), i18n( "The KBibTeX part has problems to initialize itself. Only limited functionality will be available." ), i18n( "KBibTeX Part" ) ); return ; } - TQTimer::singleShot( 250, this, SLOT( slotDeferredInitialization() ) ); + TQTimer::singleShot( 250, this, TQ_SLOT( slotDeferredInitialization() ) ); } } diff --git a/src/kbibtex_part.h b/src/kbibtex_part.h index 561101c..a04b7cc 100644 --- a/src/kbibtex_part.h +++ b/src/kbibtex_part.h @@ -46,7 +46,7 @@ class TDEMainWindow; class KBibTeXPart : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: KBibTeXPart( TQWidget *parentWidget, const char *widgetName, @@ -152,7 +152,7 @@ class TDEAboutData; class KBibTeXPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KBibTeXPartFactory(); virtual ~KBibTeXPartFactory(); diff --git a/src/kbibtexshell.cpp b/src/kbibtexshell.cpp index 3c297fb..b9b8153 100644 --- a/src/kbibtexshell.cpp +++ b/src/kbibtexshell.cpp @@ -178,28 +178,28 @@ void KBibTeXShell::setupActions() { TDEAction * action; - action = KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() ); + action = KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection() ); action ->setToolTip( i18n( "Create a new window for a new BibTeX file" ) ); - TDEAction *actionOpen = KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() ); + TDEAction *actionOpen = KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); actionOpen->setToolTip( i18n( "Open an existing BibTeX file" ) ); - m_recentFiles = KStdAction::openRecent( this, SLOT( slotFileOpen( const KURL& ) ), actionCollection() ); + m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotFileOpen( const KURL& ) ), actionCollection() ); m_recentFiles->setWhatsThis( i18n( "This lists files which you have opened recently, and allows you to easily open them again." ) ); - connect( m_recentFiles, SIGNAL( activated() ), actionOpen, SLOT( activate() ) ); + connect( m_recentFiles, TQ_SIGNAL( activated() ), actionOpen, TQ_SLOT( activate() ) ); - action = KStdAction::close( this, SLOT( slotFileClose() ), actionCollection() ); + action = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection() ); action->setToolTip( i18n( "Close this KBibTeX window" ) ); - // action = KStdAction::quit( kapp, SLOT( closeAllWindows() ), actionCollection() ); + // action = KStdAction::quit( kapp, TQ_SLOT( closeAllWindows() ), actionCollection() ); // action->setToolTip( i18n( "Close all windows and quit KBibTeX" ) ); - m_statusbarAction = KStdAction::showStatusbar( this, SLOT( optionsShowStatusbar() ), actionCollection() ); + m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( optionsShowStatusbar() ), actionCollection() ); m_statusbarAction->setToolTip( i18n( "Show or hide the window's status bar" ) ); - KStdAction::keyBindings( this, SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) ); - KStdAction::configureToolbars( this, SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) ); + KStdAction::keyBindings( this, TQ_SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) ); + KStdAction::configureToolbars( this, TQ_SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) ); - connect( actionCollection(), SIGNAL( actionStatusText( const TQString & ) ), this, SLOT( slotActionStatusText( const TQString & ) ) ); - connect( actionCollection(), SIGNAL( clearStatusText( ) ), statusBar(), SLOT( clear() ) ); + connect( actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( actionCollection(), TQ_SIGNAL( clearStatusText( ) ), statusBar(), TQ_SLOT( clear() ) ); } void KBibTeXShell::slotActionStatusText( const TQString &text ) @@ -260,8 +260,8 @@ void KBibTeXShell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg( factory() ); - connect( &dlg, SIGNAL( newToolbarConfig() ), - this, SLOT( applyNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( applyNewToolbarConfig() ) ); dlg.exec(); } @@ -365,7 +365,7 @@ void KBibTeXShell::initializePart( KParts::ReadWritePart* part ) { if ( part ) { - connect( static_cast<KBibTeXPart*>( part ), SIGNAL( signalAddRecentURL( const KURL & ) ), this, SLOT( slotAddRecentURL( const KURL& ) ) ); + connect( static_cast<KBibTeXPart*>( part ), TQ_SIGNAL( signalAddRecentURL( const KURL & ) ), this, TQ_SLOT( slotAddRecentURL( const KURL& ) ) ); } } diff --git a/src/kbibtexshell.h b/src/kbibtexshell.h index 969dec9..de59905 100644 --- a/src/kbibtexshell.h +++ b/src/kbibtexshell.h @@ -37,7 +37,7 @@ class TDERecentFilesAction; class KBibTeXShell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KBibTeXShell( TQWidget* parentWidget = 0, const char* name = 0 ); diff --git a/src/macrowidget.cpp b/src/macrowidget.cpp index daeb771..307c76d 100644 --- a/src/macrowidget.cpp +++ b/src/macrowidget.cpp @@ -40,7 +40,7 @@ namespace KBibTeX MacroWidget* macroWidget = new MacroWidget( macro, isReadOnly, dlg, "MacroWidget" ); dlg->setMainWidget( macroWidget ); - connect( dlg, SIGNAL( okClicked() ), macroWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), macroWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode ) dlg->exec(); diff --git a/src/macrowidget.h b/src/macrowidget.h index d31478e..2fda075 100644 --- a/src/macrowidget.h +++ b/src/macrowidget.h @@ -31,7 +31,7 @@ namespace KBibTeX { class MacroWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( BibTeX::Macro *macro, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/mergeelements.cpp b/src/mergeelements.cpp index 3a7f3d3..5137f59 100644 --- a/src/mergeelements.cpp +++ b/src/mergeelements.cpp @@ -167,10 +167,10 @@ namespace KBibTeX vboxLayout->setStretchFactor( m_listViewAlternatives, 3 ); label->setBuddy( m_listViewAlternatives ); - connect( m_listViewClique, SIGNAL( doubleClicked( TQListViewItem * ) ), this, SLOT( slotPreviewElement( TQListViewItem * ) ) ); - connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotNextClique() ) ); - connect( this, SIGNAL( user2Clicked() ), this, SLOT( slotPreviousClique() ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( saveCurrentMergeSet() ) ); + connect( m_listViewClique, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotNextClique() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotPreviousClique() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( saveCurrentMergeSet() ) ); } void MergeElements::setClique( int cliqueIndex ) @@ -188,7 +188,7 @@ namespace KBibTeX if ( entry != NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( entry, NULL, NULL, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } else { @@ -196,7 +196,7 @@ namespace KBibTeX if ( macro != NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( NULL, macro, NULL, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } else { @@ -204,7 +204,7 @@ namespace KBibTeX if ( preamble!=NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( NULL, NULL, preamble, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } } } @@ -774,7 +774,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : width(); @@ -805,7 +805,7 @@ namespace KBibTeX void MergeElements::showEvent( TQShowEvent * ) { tqDebug( "showEvent" ); - TQTimer::singleShot( 10, this, SLOT( slotRestore() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotRestore() ) ); } void MergeElements::slotRestore() @@ -838,7 +838,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/mergeelements.h b/src/mergeelements.h index e58dc7b..11c0727 100644 --- a/src/mergeelements.h +++ b/src/mergeelements.h @@ -35,7 +35,7 @@ namespace KBibTeX { class MergeElementsCliqueItem : public TQObject, public TQCheckListItem { - Q_OBJECT + TQ_OBJECT public: MergeElementsCliqueItem( BibTeX::Entry* entry, BibTeX::Macro* macro, BibTeX::Preamble* preamble, TQListView *parent ); BibTeX::Entry* entry; @@ -121,7 +121,7 @@ namespace KBibTeX */ class MergeElements : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: MergeElements( TQWidget *parent ); ~MergeElements(); diff --git a/src/preamblewidget.cpp b/src/preamblewidget.cpp index abd6e70..68b5ed5 100644 --- a/src/preamblewidget.cpp +++ b/src/preamblewidget.cpp @@ -34,7 +34,7 @@ namespace KBibTeX PreambleWidget* preambleWidget = new PreambleWidget( preamble, isReadOnly, dlg, "PreambleWidget" ); dlg->setMainWidget( preambleWidget ); - connect( dlg, SIGNAL( okClicked() ), preambleWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), preambleWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode ) dlg->exec(); diff --git a/src/preamblewidget.h b/src/preamblewidget.h index 6d5e985..4551c90 100644 --- a/src/preamblewidget.h +++ b/src/preamblewidget.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class PreambleWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( BibTeX::Preamble *preamble, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/searchbar.cpp b/src/searchbar.cpp index 2cf06b9..290e31b 100644 --- a/src/searchbar.cpp +++ b/src/searchbar.cpp @@ -42,7 +42,7 @@ namespace KBibTeX : TQWidget( parent, name ) { m_timerInput = new TQTimer( this ); - connect( m_timerInput, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( m_timerInput, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); setupGUI(); } @@ -95,7 +95,7 @@ namespace KBibTeX m_pushButtonSearchOnlineDatabases->setIconSet( TQIconSet( BarIcon( "network" ) ) ); layout->addWidget( m_pushButtonSearchOnlineDatabases ); TQToolTip::add( m_pushButtonSearchOnlineDatabases, i18n( "Add a new BibTeX entry from an online database" ) ); - connect( m_pushButtonSearchOnlineDatabases, SIGNAL( clicked() ), this, SIGNAL( onlineSearch() ) ); + connect( m_pushButtonSearchOnlineDatabases, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( onlineSearch() ) ); layout->insertSpacing( 2, KDialog::spacingHint() ); @@ -137,14 +137,14 @@ namespace KBibTeX m_comboboxRestrictTo->insertItem( Settings::fieldTypeToI18NString( fieldType ) ); } - connect( m_comboboxFilter->lineEdit(), SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotKeyPressed() ) ); - connect( m_comboboxFilter, SIGNAL( activated( const TQString& ) ), m_comboboxFilter, SLOT( addToHistory( const TQString& ) ) ); - connect( m_pushButtonClearSearchText, SIGNAL( clicked() ), this, SLOT( slotClear() ) ); - connect( m_comboboxFilterType, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilter, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilter->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilterType, SIGNAL( activated( int ) ), this, SLOT( slotTimeout() ) ); - connect( m_comboboxRestrictTo, SIGNAL( activated( int ) ), this, SLOT( slotTimeout() ) ); + connect( m_comboboxFilter->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotKeyPressed() ) ); + connect( m_comboboxFilter, TQ_SIGNAL( activated( const TQString& ) ), m_comboboxFilter, TQ_SLOT( addToHistory( const TQString& ) ) ); + connect( m_pushButtonClearSearchText, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); + connect( m_comboboxFilterType, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilter, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilter->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilterType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTimeout() ) ); + connect( m_comboboxRestrictTo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTimeout() ) ); setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); } diff --git a/src/searchbar.h b/src/searchbar.h index c570114..30cb7aa 100644 --- a/src/searchbar.h +++ b/src/searchbar.h @@ -40,7 +40,7 @@ namespace KBibTeX */ class SearchBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchBar( TQWidget *parent = 0, const char *name = "search_bar" ); ~SearchBar(); diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp index 4df650a..5f05e32 100644 --- a/src/settingsdlg.cpp +++ b/src/settingsdlg.cpp @@ -43,47 +43,47 @@ namespace KBibTeX TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); m_editing = new SettingsEditing( page ); layout->addWidget( m_editing ); - connect( m_editing, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_editing, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "&File Open&&Save" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_fileIO = new SettingsFileIO( page ); layout->addWidget( m_fileIO ); - connect( m_fileIO, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_fileIO, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "&Search URLs" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_searchURL = new SettingsSearchURL( page ); layout->addWidget( m_searchURL ); - connect( m_searchURL, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_searchURL, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "Global &Keywords" ), TQString::null, SmallIcon( "package" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_keyword = new SettingsKeyword( page ); layout->addWidget( m_keyword ); - connect( m_keyword, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_keyword, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "Id Suggestions" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_idSuggestions = new SettingsIdSuggestions( page ); layout->addWidget( m_idSuggestions ); - connect( m_idSuggestions, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_idSuggestions, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "User Defined Fields" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_userDefinedInput = new SettingsUserDefinedInput( page ); layout->addWidget( m_userDefinedInput ); - connect( m_userDefinedInput, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_userDefinedInput, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); #ifdef HAVE_YAZ page = addPage( i18n( "Z39.50" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_z3950config = new SettingsZ3950( page ); layout->addWidget( m_z3950config ); - connect( m_z3950config, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_z3950config, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); #endif // HAVE_YAZ - connect( this, SIGNAL( applyClicked() ), SLOT( slotApplySettings() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), TQ_SLOT( slotApplySettings() ) ); } diff --git a/src/settingsdlg.h b/src/settingsdlg.h index 5097934..8315a7e 100644 --- a/src/settingsdlg.h +++ b/src/settingsdlg.h @@ -40,7 +40,7 @@ namespace KBibTeX class SettingsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SettingsDlg( TQWidget *parent = 0, const char *name = "SETTINGsdlg" ); diff --git a/src/settingsediting.cpp b/src/settingsediting.cpp index 4431789..912183b 100644 --- a/src/settingsediting.cpp +++ b/src/settingsediting.cpp @@ -84,11 +84,11 @@ namespace KBibTeX layout->setRowStretch( 4, 1 ); layout->setColStretch( 0, 1 ); - connect( m_urlRequesterNewPath, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_urlRequesterNewPath, SIGNAL( urlSelected( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pushButtonAddDir, SIGNAL( clicked() ), this, SLOT( slotAddDir() ) ); - connect( m_listViewPathList, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) ); - connect( m_pushButtonDelDir, SIGNAL( clicked() ), this, SLOT( slotDelDir() ) ); + connect( m_urlRequesterNewPath, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_urlRequesterNewPath, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pushButtonAddDir, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddDir() ) ); + connect( m_listViewPathList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_pushButtonDelDir, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelDir() ) ); for ( TQStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) new TQListViewItem( m_listViewPathList, *it ); @@ -99,8 +99,8 @@ namespace KBibTeX KDialogBase *dlg = new KDialogBase( parent, "SettingsEditingPathsDialog", true, i18n( "Edit Document Search Paths" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false ); SettingsEditingPaths *sep = new SettingsEditingPaths( pathList, dlg, "SettingsEditingPaths" ); dlg->setMainWidget( sep ); - connect( dlg, SIGNAL( apply() ), sep, SLOT( slotApply() ) ); - connect( dlg, SIGNAL( okClicked() ), sep, SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( apply() ), sep, TQ_SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), sep, TQ_SLOT( slotApply() ) ); bool result = dlg->exec() == TQDialog::Accepted; delete dlg; @@ -229,16 +229,16 @@ namespace KBibTeX layout->addStretch(); - connect( m_checkBoxSearchBarClearField, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_checkBoxEnableAllFields, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxDoubleClickAction, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxDragAction, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxSortingColumn, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxSortingOrder, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_pushButtonSpecialFont, SIGNAL( clicked() ), this, SLOT( slotSelectSpecialFont() ) ); - connect( m_checkBoxUseSpecialFont, SIGNAL( toggled( bool ) ), m_pushButtonSpecialFont, SLOT( setEnabled( bool ) ) ); - connect( m_checkBoxUseSpecialFont, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( btnSelectDocumentSearchPath, SIGNAL( clicked() ), this, SLOT( slotSelectDocumentSearchPath() ) ); + connect( m_checkBoxSearchBarClearField, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_checkBoxEnableAllFields, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxDoubleClickAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxDragAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxSortingColumn, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxSortingOrder, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_pushButtonSpecialFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectSpecialFont() ) ); + connect( m_checkBoxUseSpecialFont, TQ_SIGNAL( toggled( bool ) ), m_pushButtonSpecialFont, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_checkBoxUseSpecialFont, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( btnSelectDocumentSearchPath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectDocumentSearchPath() ) ); } diff --git a/src/settingsediting.h b/src/settingsediting.h index f6915f1..fef66dc 100644 --- a/src/settingsediting.h +++ b/src/settingsediting.h @@ -35,7 +35,7 @@ namespace KBibTeX { class SettingsEditingPaths: public TQWidget { - Q_OBJECT + TQ_OBJECT protected: SettingsEditingPaths( TQStringList& pathList, TQWidget*parent = 0, const char *name = 0 ); @@ -59,7 +59,7 @@ namespace KBibTeX class SettingsEditing : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsEditing( TQWidget *parent = 0, const char *name = 0 ); ~SettingsEditing(); diff --git a/src/settingsfileio.cpp b/src/settingsfileio.cpp index c148435..c79a633 100644 --- a/src/settingsfileio.cpp +++ b/src/settingsfileio.cpp @@ -288,7 +288,7 @@ namespace KBibTeX containerLayout->setStretchFactor( buttonBib2Db5, 1 ); buttonBib2Db5->setIconSet( TQIconSet( SmallIcon( "folder_open" ) ) ); label->setBuddy( buttonBib2Db5 ); - connect( buttonBib2Db5, SIGNAL( clicked() ), this, SLOT( slotBib2db5BasePath() ) ); + connect( buttonBib2Db5, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBib2db5BasePath() ) ); groupBox = new TQGroupBox( 2, Horizontal, i18n( "Export Systems" ), this ); layout->addWidget( groupBox ); @@ -329,12 +329,12 @@ namespace KBibTeX bibList.sort(); m_comboBoxBibliographyStyle->insertStringList( bibList ); - connect( m_comboBoxEncoding, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxStringDelimiters, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxKeywordCasing, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxLanguage, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxBibliographyStyle, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxExportSystemHTML, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); + connect( m_comboBoxEncoding, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxStringDelimiters, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxKeywordCasing, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxLanguage, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxBibliographyStyle, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxExportSystemHTML, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); } } diff --git a/src/settingsfileio.h b/src/settingsfileio.h index 5572ae4..30d1917 100644 --- a/src/settingsfileio.h +++ b/src/settingsfileio.h @@ -35,7 +35,7 @@ namespace KBibTeX { class SettingsFileIO : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsFileIO( TQWidget *parent = 0, const char *name = 0 ); ~SettingsFileIO(); diff --git a/src/settingsidsuggestions.cpp b/src/settingsidsuggestions.cpp index c1c68cc..057b293 100644 --- a/src/settingsidsuggestions.cpp +++ b/src/settingsidsuggestions.cpp @@ -171,7 +171,7 @@ namespace KBibTeX IdSuggestionsListViewItem * item = new IdSuggestionsListViewItem( m_listIdSuggestions, "a|Y|T", m_example ); item->setPixmap( 0, SmallIcon( "filter" ) ); m_listIdSuggestions->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditIdSuggestion() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditIdSuggestion() ) ); } void SettingsIdSuggestions::slotEditIdSuggestion() @@ -338,34 +338,34 @@ namespace KBibTeX m_listIdSuggestions->header()->setClickEnabled( FALSE ); m_listIdSuggestions->setFullWidth( true ); gridLayout->addMultiCellWidget( m_listIdSuggestions, 0, 6, 0, 0 ); - connect( m_listIdSuggestions, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listIdSuggestions, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listIdSuggestions, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditIdSuggestion() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditIdSuggestion() ) ); m_buttonNewIdSuggestion = new KPushButton( i18n( "id suggestion", "New" ), this ); m_buttonNewIdSuggestion->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonNewIdSuggestion, 0, 1 ); - connect( m_buttonNewIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotNewIdSuggestion() ) ); + connect( m_buttonNewIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewIdSuggestion() ) ); m_buttonEditIdSuggestion = new KPushButton( i18n( "id suggestion", "Edit" ), this ); m_buttonEditIdSuggestion->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); gridLayout->addWidget( m_buttonEditIdSuggestion, 1, 1 ); - connect( m_buttonEditIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotEditIdSuggestion() ) ); + connect( m_buttonEditIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditIdSuggestion() ) ); m_buttonDeleteIdSuggestion = new KPushButton( i18n( "id suggestion", "Delete" ), this ); m_buttonDeleteIdSuggestion->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteIdSuggestion, 2, 1 ); - connect( m_buttonDeleteIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotDeleteIdSuggestion() ) ); + connect( m_buttonDeleteIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteIdSuggestion() ) ); m_buttonMoveUpIdSuggestion = new KPushButton( i18n( "id suggestion", "Up" ), this ); m_buttonMoveUpIdSuggestion->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpIdSuggestion, 3, 1 ); - connect( m_buttonMoveUpIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotMoveUpIdSuggestion() ) ); + connect( m_buttonMoveUpIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpIdSuggestion() ) ); m_buttonMoveDownIdSuggestion = new KPushButton( i18n( "id suggestion", "Down" ), this ); m_buttonMoveDownIdSuggestion->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownIdSuggestion, 4, 1 ); - connect( m_buttonMoveDownIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotMoveDownIdSuggestion() ) ); + connect( m_buttonMoveDownIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownIdSuggestion() ) ); m_buttonToggleDefault = new KPushButton( i18n( "Toogle default" ), this ); m_buttonToggleDefault->setIconSet( TQIconSet( SmallIcon( "favorites" ) ) ); gridLayout->addWidget( m_buttonToggleDefault, 5, 1 ); - connect( m_buttonToggleDefault, SIGNAL( clicked() ), this, SLOT( slotToggleDefault() ) ); + connect( m_buttonToggleDefault, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleDefault() ) ); m_checkBoxForceDefault = new TQCheckBox( i18n( "Use default id suggestion when editing new entries" ), this ); gridLayout->addMultiCellWidget( m_checkBoxForceDefault, 7, 7, 0, 1 ); @@ -375,25 +375,25 @@ namespace KBibTeX m_lineEditSmallWords = new KLineEdit( this ); label->setBuddy( m_lineEditSmallWords ); gridLayout->addWidget( m_lineEditSmallWords, 10, 0 ); - connect( m_lineEditSmallWords, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotEditSmallWordsChanged( const TQString & ) ) ); + connect( m_lineEditSmallWords, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotEditSmallWordsChanged( const TQString & ) ) ); m_buttonAddSmallWord = new KPushButton( i18n( "Add" ), this ); m_buttonAddSmallWord->setEnabled( false ); m_buttonAddSmallWord->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonAddSmallWord, 10, 1 ); - connect( m_buttonAddSmallWord, SIGNAL( clicked() ), this, SLOT( slotAddSmallWord() ) ); + connect( m_buttonAddSmallWord, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddSmallWord() ) ); m_listSmallWords = new TDEListView( this ); m_listSmallWords->addColumn( i18n( "Small Words" ) ); m_listSmallWords->header()->setClickEnabled( true ); m_listSmallWords->setFullWidth( true ); - connect( m_listSmallWords, SIGNAL( selectionChanged() ), this, SLOT( slotListSmallWordsChanged() ) ); - connect( m_listSmallWords, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( slotListSmallWordsChanged() ) ); + connect( m_listSmallWords, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotListSmallWordsChanged() ) ); + connect( m_listSmallWords, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( slotListSmallWordsChanged() ) ); gridLayout->addMultiCellWidget( m_listSmallWords, 11, 12, 0, 0 ); m_buttonDeleteSmallWord = new KPushButton( i18n( "Delete" ), this ); m_buttonDeleteSmallWord->setEnabled( false ); m_buttonDeleteSmallWord->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteSmallWord, 11, 1 ); - connect( m_buttonDeleteSmallWord, SIGNAL( clicked() ), this, SLOT( slotDeleteSmallWord() ) ); + connect( m_buttonDeleteSmallWord, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteSmallWord() ) ); } } diff --git a/src/settingsidsuggestions.h b/src/settingsidsuggestions.h index fc04655..119b333 100644 --- a/src/settingsidsuggestions.h +++ b/src/settingsidsuggestions.h @@ -55,7 +55,7 @@ namespace KBibTeX */ class SettingsIdSuggestions : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsIdSuggestions( TQWidget *parent = 0, const char *name = 0 ); ~SettingsIdSuggestions(); diff --git a/src/settingskeyword.cpp b/src/settingskeyword.cpp index de309dd..707147c 100644 --- a/src/settingskeyword.cpp +++ b/src/settingskeyword.cpp @@ -84,7 +84,7 @@ namespace KBibTeX item->setPixmap( 0, SmallIcon( "package" ) ); m_listKeywords->setSelected( item, TRUE ); m_listKeywords->ensureItemVisible( item ); - TQTimer::singleShot( 100, this, SLOT( slotEditKeyword() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditKeyword() ) ); } void SettingsKeyword::slotEditKeyword() @@ -177,15 +177,15 @@ namespace KBibTeX m_buttonImportKeywords->setIconSet( TQIconSet( SmallIcon( "openfile" ) ) ); TQToolTip::add( m_buttonImportKeywords, "Import all keywords from the current BibTeX file" ); gridLayout->addWidget( m_buttonImportKeywords, 4, 1 ); - connect( m_buttonImportKeywords, SIGNAL( clicked() ), this, SLOT( slotImportKeywords() ) ); - - connect( m_buttonNewKeyword, SIGNAL( clicked() ), this, SLOT( slotNewKeyword() ) ); - connect( m_buttonEditKeyword, SIGNAL( clicked() ), this, SLOT( slotEditKeyword() ) ); - connect( m_buttonDeleteKeyword, SIGNAL( clicked() ), this, SLOT( slotDeleteKeyword() ) ); - connect( m_listKeywords, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listKeywords, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listKeywords, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditKeyword() ) ); - connect( m_listKeywords, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( slotItemRenamed( TQListViewItem* ) ) ); + connect( m_buttonImportKeywords, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotImportKeywords() ) ); + + connect( m_buttonNewKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewKeyword() ) ); + connect( m_buttonEditKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditKeyword() ) ); + connect( m_buttonDeleteKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteKeyword() ) ); + connect( m_listKeywords, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listKeywords, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listKeywords, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditKeyword() ) ); + connect( m_listKeywords, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( slotItemRenamed( TQListViewItem* ) ) ); updateGUI(); } diff --git a/src/settingskeyword.h b/src/settingskeyword.h index ea26c71..bbbdab5 100644 --- a/src/settingskeyword.h +++ b/src/settingskeyword.h @@ -33,7 +33,7 @@ namespace KBibTeX */ class SettingsKeyword : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsKeyword( TQWidget *parent = 0, const char *name = 0 ); ~SettingsKeyword(); diff --git a/src/settingssearchurl.cpp b/src/settingssearchurl.cpp index 03c8983..ab791f2 100644 --- a/src/settingssearchurl.cpp +++ b/src/settingssearchurl.cpp @@ -153,14 +153,14 @@ namespace KBibTeX m_pushbuttonReset->setIconSet( TQIconSet( SmallIcon( "reload" ) ) ); layout->addWidget( m_pushbuttonReset, 4, 1 ); - connect( m_pushbuttonNew, SIGNAL( clicked() ), this, SLOT( slotNew() ) ); - connect( m_pushbuttonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); - connect( m_listviewSearchURLs, SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, SLOT( slotEdit() ) ); - connect( m_pushbuttonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); - connect( m_pushbuttonReset, SIGNAL( clicked() ), this, SLOT( slotReset() ) ); - connect( m_listviewSearchURLs, SIGNAL( selectionChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listviewSearchURLs, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listviewSearchURLs, SIGNAL( onItem( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_pushbuttonNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( m_pushbuttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( slotEdit() ) ); + connect( m_pushbuttonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); + connect( m_pushbuttonReset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReset() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( onItem( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); updateGUI(); } diff --git a/src/settingssearchurl.h b/src/settingssearchurl.h index e3bdddf..ede770c 100644 --- a/src/settingssearchurl.h +++ b/src/settingssearchurl.h @@ -31,7 +31,7 @@ namespace KBibTeX { class SettingsSearchURL : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsSearchURL( TQWidget *parent = 0, const char *name = 0 ); ~SettingsSearchURL(); diff --git a/src/settingsuserdefinedinput.cpp b/src/settingsuserdefinedinput.cpp index 91cf92c..9c66ea7 100644 --- a/src/settingsuserdefinedinput.cpp +++ b/src/settingsuserdefinedinput.cpp @@ -189,18 +189,18 @@ namespace KBibTeX m_buttonMoveUpField = new KPushButton( i18n( "user-defined input", "Up" ), this ); m_buttonMoveUpField->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpField, 3, 1 ); - connect( m_buttonMoveUpField, SIGNAL( clicked() ), this, SLOT( slotMoveUpField() ) ); + connect( m_buttonMoveUpField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpField() ) ); m_buttonMoveDownField = new KPushButton( i18n( "user-defined input", "Down" ), this ); m_buttonMoveDownField->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownField, 4, 1 ); - connect( m_buttonMoveDownField, SIGNAL( clicked() ), this, SLOT( slotMoveDownField() ) ); + connect( m_buttonMoveDownField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownField() ) ); - connect( m_buttonNewField, SIGNAL( clicked() ), this, SLOT( slotNewField() ) ); - connect( m_buttonEditField, SIGNAL( clicked() ), this, SLOT( slotEditField() ) ); - connect( m_buttonDeleteField, SIGNAL( clicked() ), this, SLOT( slotDeleteField() ) ); - connect( m_listFields, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listFields, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditField() ) ); - connect( m_listFields, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_buttonNewField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewField() ) ); + connect( m_buttonEditField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditField() ) ); + connect( m_buttonDeleteField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteField() ) ); + connect( m_listFields, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listFields, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditField() ) ); + connect( m_listFields, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); updateGUI(); } @@ -241,8 +241,8 @@ namespace KBibTeX else fieldDlg->enableButton( KDialogBase::Ok, false ); - connect( m_lineEditName, SIGNAL( textChanged( const TQString & ) ), this, SLOT( updateDialogGUI() ) ); - connect( m_lineEditLabel, SIGNAL( textChanged( const TQString & ) ), this, SLOT( updateDialogGUI() ) ); + connect( m_lineEditName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDialogGUI() ) ); + connect( m_lineEditLabel, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDialogGUI() ) ); if ( fieldDlg->exec() == TQDialog::Accepted ) { if ( item == NULL ) diff --git a/src/settingsuserdefinedinput.h b/src/settingsuserdefinedinput.h index 10e7239..05f5e4f 100644 --- a/src/settingsuserdefinedinput.h +++ b/src/settingsuserdefinedinput.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class SettingsUserDefinedInput : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsUserDefinedInput( TQWidget *parent = 0, const char *name = 0 ); ~SettingsUserDefinedInput(); diff --git a/src/settingsz3950.cpp b/src/settingsz3950.cpp index e1f6baa..6b140ba 100644 --- a/src/settingsz3950.cpp +++ b/src/settingsz3950.cpp @@ -149,8 +149,8 @@ namespace KBibTeX KDialogBase *dlg = new KDialogBase( parent, "SettingsZ3950Edit", true, i18n( "Edit Z39.50 Server" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false ); SettingsZ3950Edit *edit = new SettingsZ3950Edit( id, server, dlg, "SettingsZ3950Edit" ); dlg->setMainWidget( edit ); - connect( dlg, SIGNAL( apply() ), edit, SLOT( slotApply() ) ); - connect( dlg, SIGNAL( okClicked() ), edit, SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( apply() ), edit, TQ_SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), edit, TQ_SLOT( slotApply() ) ); return dlg->exec(); } @@ -218,7 +218,7 @@ namespace KBibTeX ServerListViewItem * item = new ServerListViewItem( m_listServers, "", server, true ); item->setPixmap( 0, SmallIcon( "server" ) ); m_listServers->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditServer() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditServer() ) ); } void SettingsZ3950::slotEditServer() @@ -327,35 +327,35 @@ namespace KBibTeX m_listServers->setFullWidth( true ); m_listServers->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( m_listServers, 0, 7, 0, 0 ); - connect( m_listServers, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listServers, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listServers, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditServer() ) ); + connect( m_listServers, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listServers, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listServers, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditServer() ) ); m_buttonNewServer = new KPushButton( i18n( "z3950 server", "New" ), this ); m_buttonNewServer->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonNewServer, 0, 1 ); - connect( m_buttonNewServer, SIGNAL( clicked() ), this, SLOT( slotNewServer() ) ); + connect( m_buttonNewServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewServer() ) ); m_buttonEditServer = new KPushButton( i18n( "z3950 server", "Edit" ), this ); m_buttonEditServer->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); gridLayout->addWidget( m_buttonEditServer, 1, 1 ); - connect( m_buttonEditServer, SIGNAL( clicked() ), this, SLOT( slotEditServer() ) ); + connect( m_buttonEditServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditServer() ) ); m_buttonDeleteServer = new KPushButton( i18n( "z3950 server", "Delete" ), this ); m_buttonDeleteServer->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteServer, 2, 1 ); - connect( m_buttonDeleteServer, SIGNAL( clicked() ), this, SLOT( slotDeleteServer() ) ); + connect( m_buttonDeleteServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteServer() ) ); m_buttonMoveUpServer = new KPushButton( i18n( "z3950 server", "Up" ), this ); m_buttonMoveUpServer->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpServer, 3, 1 ); - connect( m_buttonMoveUpServer, SIGNAL( clicked() ), this, SLOT( slotMoveUpServer() ) ); + connect( m_buttonMoveUpServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpServer() ) ); m_buttonMoveDownServer = new KPushButton( i18n( "z3950 server", "Down" ), this ); m_buttonMoveDownServer->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownServer, 4, 1 ); - connect( m_buttonMoveDownServer, SIGNAL( clicked() ), this, SLOT( slotMoveDownServer() ) ); + connect( m_buttonMoveDownServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownServer() ) ); m_buttonResetToDefault = new KPushButton( i18n( "z3950 server", "Reset" ), this ); m_buttonResetToDefault->setIconSet( TQIconSet( SmallIcon( "reload" ) ) ); gridLayout->addWidget( m_buttonResetToDefault, 6, 1 ); - connect( m_buttonResetToDefault, SIGNAL( clicked() ), this, SLOT( slotResetToDefault() ) ); + connect( m_buttonResetToDefault, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotResetToDefault() ) ); } } diff --git a/src/settingsz3950.h b/src/settingsz3950.h index 5bfa2cc..b80a0f6 100644 --- a/src/settingsz3950.h +++ b/src/settingsz3950.h @@ -57,7 +57,7 @@ namespace KBibTeX */ class SettingsZ3950Edit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~SettingsZ3950Edit(); @@ -89,7 +89,7 @@ namespace KBibTeX */ class SettingsZ3950 : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsZ3950( TQWidget *parent = 0, const char *name = 0 ); ~SettingsZ3950(); diff --git a/src/sidebar.cpp b/src/sidebar.cpp index cf45678..0f4dcf8 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -132,14 +132,14 @@ namespace KBibTeX layout->addMultiCellWidget( m_listAvailableItems, 1, 1, 0, 2 ); m_popupMenu = new TDEPopupMenu( m_listAvailableItems ); - m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, SLOT( startRenaming() ) ); - - connect( m_listAvailableItems, SIGNAL( selectionChanged() ), this, SLOT( prepareSearch() ) ); - connect( m_listTypeList, SIGNAL( activated( int ) ), this, SLOT( refreshLists() ) ); - connect( m_buttonToggleShowAll, SIGNAL( toggled( bool ) ), this, SLOT( toggleShowAll( bool ) ) ); - connect( m_buttonToggleMultiSelect, SIGNAL( toggled( bool ) ), this, SLOT( toggleMultiSelect( bool ) ) ); - connect( m_listAvailableItems, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( showContextMenu( TQListViewItem*, const TQPoint& ) ) ); - connect( m_listAvailableItems, SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, SLOT( endRenaming( TQListViewItem*, int, const TQString& ) ) ); + m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, TQ_SLOT( startRenaming() ) ); + + connect( m_listAvailableItems, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( prepareSearch() ) ); + connect( m_listTypeList, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( refreshLists() ) ); + connect( m_buttonToggleShowAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleShowAll( bool ) ) ); + connect( m_buttonToggleMultiSelect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleMultiSelect( bool ) ) ); + connect( m_listAvailableItems, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( showContextMenu( TQListViewItem*, const TQPoint& ) ) ); + connect( m_listAvailableItems, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, TQ_SLOT( endRenaming( TQListViewItem*, int, const TQString& ) ) ); toggleShowAll( FALSE ); } diff --git a/src/sidebar.h b/src/sidebar.h index c945aef..ee0f4e0 100644 --- a/src/sidebar.h +++ b/src/sidebar.h @@ -36,7 +36,7 @@ namespace KBibTeX { class SideBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SideBar( bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~SideBar(); diff --git a/src/valuewidget.cpp b/src/valuewidget.cpp index d997cdf..349f460 100644 --- a/src/valuewidget.cpp +++ b/src/valuewidget.cpp @@ -40,7 +40,7 @@ namespace KBibTeX ValueWidget* valueWidget = new ValueWidget( fieldType, value, isReadOnly, dlg, "kbibtexvaluewidget" ); dlg->setMainWidget( valueWidget ); - connect( dlg, SIGNAL( okClicked() ), valueWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), valueWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode )dlg->exec(); if ( isReadOnly ) result = TQDialog::Rejected; @@ -214,40 +214,40 @@ namespace KBibTeX m_listViewValue->header() ->setClickEnabled( FALSE ); m_listViewValue->header() ->setStretchEnabled( TRUE, 0 ); m_listViewValue->setEnabled( !m_isReadOnly ); - connect( m_listViewValue, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listViewValue, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewValue, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonAdd = new TQPushButton( i18n( "Add" ), this ); layout->addWidget( m_pushButtonAdd, 1, 1 ); m_pushButtonAdd->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); m_pushButtonAdd->setEnabled( !m_isReadOnly ); - connect( m_pushButtonAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); m_pushButtonEdit = new TQPushButton( i18n( "Edit" ), this ); layout->addWidget( m_pushButtonEdit, 2, 1 ); m_pushButtonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); - connect( m_pushButtonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); + connect( m_pushButtonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); m_pushButtonToggle = new TQPushButton( i18n( "Toggle" ), this ); layout->addWidget( m_pushButtonToggle, 3, 1 ); m_pushButtonToggle->setIconSet( TQIconSet( SmallIcon( "flag" ) ) ); - connect( m_pushButtonToggle, SIGNAL( clicked() ), this, SLOT( slotToggle() ) ); + connect( m_pushButtonToggle, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggle() ) ); m_pushButtonDelete = new TQPushButton( i18n( "Delete" ), this ); layout->addWidget( m_pushButtonDelete, 4, 1 ); m_pushButtonDelete->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); m_pushButtonUp = new TQPushButton( i18n( "Up" ), this ); layout->addWidget( m_pushButtonUp, 5, 1 ); m_pushButtonUp->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); m_pushButtonDown = new TQPushButton( i18n( "Down" ), this ); layout->addWidget( m_pushButtonDown, 6, 1 ); m_pushButtonDown->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); } } diff --git a/src/valuewidget.h b/src/valuewidget.h index d3661fe..9d9f9e0 100644 --- a/src/valuewidget.h +++ b/src/valuewidget.h @@ -37,7 +37,7 @@ namespace KBibTeX */ class ValueWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( const TQString& title, BibTeX::EntryField::FieldType fieldType, BibTeX::Value *value, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/webquery.cpp b/src/webquery.cpp index 3bb4dc9..959ac44 100644 --- a/src/webquery.cpp +++ b/src/webquery.cpp @@ -97,8 +97,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -111,8 +111,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } void WebQueryWidget::slotTextChanged( const TQString& text ) @@ -124,7 +124,7 @@ namespace KBibTeX { bool doEnable = !text.stripWhiteSpace().replace( '$', "" ).isEmpty(); if ( delayed && doEnable ) - TQTimer::singleShot( 100, this, SLOT( slotEnableSearchTrue() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEnableSearchTrue() ) ); else if ( !delayed ) emit enableSearch( doEnable ); } @@ -155,7 +155,7 @@ namespace KBibTeX m_progressDialog->setAutoClose( true ); m_progressDialog->setMinimumDuration( 10 ); m_progressDialog->setEnabled( true ); - connect( m_progressDialog, SIGNAL( cancelClicked() ), this, SLOT( slotCancelQuery() ) ); + connect( m_progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancelQuery() ) ); } void WebQuery::cancelQuery() @@ -216,10 +216,10 @@ namespace KBibTeX m_incomingData = ""; m_currentJobTotalSize = -1; m_currentJob = TDEIO::get( url, false, false ); - connect( m_currentJob, SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( m_currentJob, SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( m_currentJob, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, SLOT( slotJobData( TDEIO::Job*, const TQByteArray & ) ) ); - connect( m_currentJob, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotJobFinished( TDEIO::Job* ) ) ); + connect( m_currentJob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQ_SLOT( slotSetJobTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( m_currentJob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQ_SLOT( slotSetJobProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( m_currentJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotJobData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( m_currentJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotJobFinished( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); @@ -314,7 +314,7 @@ namespace KBibTeX WebQueryWizard *wiz = new WebQueryWizard( dlg, "WebQueryWizard" ); dlg->setButtonOK( KGuiItem( i18n( "&Import" ), "import", i18n( "Import selected items" ) ) ); dlg->setMainWidget( wiz ); - connect( wiz, SIGNAL( changeButtonOK( bool ) ), dlg, SLOT( enableButtonOK( bool ) ) ); + connect( wiz, TQ_SIGNAL( changeButtonOK( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); dlg->enableButtonOK( false ); results.clear(); @@ -383,8 +383,8 @@ namespace KBibTeX m_dlg->enableButtonCancel( FALSE ); TQApplication::setOverrideCursor( TQt::waitCursor ); m_listViewResults->clear(); - connect( m_webQueries[index], SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( addHit( BibTeX::Entry*, bool ) ) ); - connect( m_webQueries[index], SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endSearch( WebQuery::Status ) ) ); + connect( m_webQueries[index], TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( addHit( BibTeX::Entry*, bool ) ) ); + connect( m_webQueries[index], TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endSearch( WebQuery::Status ) ) ); m_webQueries[index]->query(); } @@ -392,8 +392,8 @@ namespace KBibTeX void WebQueryWizard::endSearch( WebQuery::Status status ) { int index = m_comboBoxEngines->currentItem(); - disconnect( m_webQueries[index], SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( addHit( BibTeX::Entry*, bool ) ) ); - disconnect( m_webQueries[index], SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endSearch( WebQuery::Status ) ) ); + disconnect( m_webQueries[index], TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( addHit( BibTeX::Entry*, bool ) ) ); + disconnect( m_webQueries[index], TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endSearch( WebQuery::Status ) ) ); setEnabled( TRUE ); m_dlg->enableButtonCancel( TRUE ); importEnableChanging(); @@ -433,7 +433,7 @@ namespace KBibTeX m_comboBoxEngines = new KComboBox( FALSE, this ); label->setBuddy( m_comboBoxEngines ); layout->addWidget( m_comboBoxEngines, 0, 1 ); - connect( m_comboBoxEngines, SIGNAL( activated( int ) ), this, SLOT( otherEngineSelected( int ) ) ); + connect( m_comboBoxEngines, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( otherEngineSelected( int ) ) ); m_widgetStackQueries = new TQWidgetStack( this ); layout->addMultiCellWidget( m_widgetStackQueries, 1, 2, 0, 2 ); @@ -457,8 +457,8 @@ namespace KBibTeX m_listViewResults->setFullWidth( true ); m_listViewResults->setSelectionMode( TQListView::Extended ); layout->addMultiCellWidget( m_listViewResults, 3, 3, 0, 3 ); - connect( m_listViewResults, SIGNAL( executed( TQListViewItem* ) ), this, SLOT( previewEntry( TQListViewItem* ) ) ); - connect( m_listViewResults, SIGNAL( returnPressed( TQListViewItem* ) ), this, SLOT( previewEntry( TQListViewItem* ) ) ); + connect( m_listViewResults, TQ_SIGNAL( executed( TQListViewItem* ) ), this, TQ_SLOT( previewEntry( TQListViewItem* ) ) ); + connect( m_listViewResults, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), this, TQ_SLOT( previewEntry( TQListViewItem* ) ) ); TQHBoxLayout *horizontalLayout = new TQHBoxLayout(); layout->addMultiCellLayout( horizontalLayout, 4, 4, 0, 3 ); @@ -469,11 +469,11 @@ namespace KBibTeX m_checkBoxImportAll->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); horizontalLayout->addWidget( m_checkBoxImportAll ); - connect( m_disclaimerLabel, SIGNAL( leftClickedURL( const TQString& ) ), this, SLOT( openURL( const TQString& ) ) ); - connect( m_listViewResults, SIGNAL( selectionChanged( ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_listViewResults, SIGNAL( clicked( TQListViewItem* ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_checkBoxImportAll, SIGNAL( toggled( bool ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_pushButtonSearch, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); + connect( m_disclaimerLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), this, TQ_SLOT( openURL( const TQString& ) ) ); + connect( m_listViewResults, TQ_SIGNAL( selectionChanged( ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_listViewResults, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_checkBoxImportAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_pushButtonSearch, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startSearch() ) ); } void WebQueryWizard::setupQueries() @@ -515,8 +515,8 @@ namespace KBibTeX { m_comboBoxEngines->insertItem(( *it )->title() ); m_widgetStackQueries->addWidget(( *it )->widget() ); - connect(( *it )->widget(), SIGNAL( enableSearch( bool ) ), this, SLOT( enableSearch( bool ) ) ); - connect(( *it )->widget(), SIGNAL( startSearch() ), this, SLOT( startSearch() ) ); + connect(( *it )->widget(), TQ_SIGNAL( enableSearch( bool ) ), this, TQ_SLOT( enableSearch( bool ) ) ); + connect(( *it )->widget(), TQ_SIGNAL( startSearch() ), this, TQ_SLOT( startSearch() ) ); } } @@ -526,7 +526,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( m_dlg->winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : m_dlg->width(); @@ -576,7 +576,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/webquery.h b/src/webquery.h index 372d05c..c4af9c4 100644 --- a/src/webquery.h +++ b/src/webquery.h @@ -46,7 +46,7 @@ namespace KBibTeX */ class WebQueryWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryWidget( TQWidget *parent, const char *name = 0 ); virtual bool searchPossible(); @@ -74,7 +74,7 @@ namespace KBibTeX */ class WebQuery : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Status { statusSuccess, statusError, statusAborted, statusInvalidQuery, statusInsufficientPermissions }; @@ -124,7 +124,7 @@ namespace KBibTeX class WebQueryWizard: public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~WebQueryWizard(); diff --git a/src/webqueryamatex.h b/src/webqueryamatex.h index 8d37c29..293ff1b 100644 --- a/src/webqueryamatex.h +++ b/src/webqueryamatex.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryAmatexWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryAmatexWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryAmatex : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryAmatex( TQWidget* parent ); virtual ~WebQueryAmatex(); diff --git a/src/webqueryarxiv.cpp b/src/webqueryarxiv.cpp index 89a35e0..5611007 100644 --- a/src/webqueryarxiv.cpp +++ b/src/webqueryarxiv.cpp @@ -170,8 +170,8 @@ namespace KBibTeX KURL url = KURL( TQString( "http://www.arxiv.org/find/all/1/all:+%2/0/1/0/all/0/1?per_page=%1" ).arg( m_numberOfResults ).arg( query.replace( "%", "%25" ).replace( "+", "%2B" ).replace( " ", "%20" ).replace( "#", "%23" ).replace( "&", "%26" ).replace( "?", "%3F" ) ) ); m_currentJobMutex.lock(); TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivResult( TDEIO::Job * ) ) ); } void WebQueryArXiv::unlockJob( TDEIO::Job * ) @@ -227,8 +227,8 @@ namespace KBibTeX m_aborted = false; m_currentJobMutex.lock(); TDEIO::Job *job = TDEIO::storedGet( abstractURL, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); } void WebQueryArXiv::arXivAbstractResult( TDEIO::Job *job ) @@ -554,8 +554,8 @@ namespace KBibTeX m_urls.remove( url ); m_currentJobMutex.lock(); TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); } else setEndSearch( WebQuery::statusSuccess ); diff --git a/src/webqueryarxiv.h b/src/webqueryarxiv.h index 13d2a87..c536c49 100644 --- a/src/webqueryarxiv.h +++ b/src/webqueryarxiv.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class WebQueryArXivWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryArXivWidget( TQWidget *parent, const char *name = 0 ); }; @@ -48,7 +48,7 @@ namespace KBibTeX */ class WebQueryArXiv : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryArXiv( TQWidget* parent ); virtual ~WebQueryArXiv(); diff --git a/src/webquerybibsonomy.h b/src/webquerybibsonomy.h index cbea036..0415661 100644 --- a/src/webquerybibsonomy.h +++ b/src/webquerybibsonomy.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryBibSonomyWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryBibSonomyWidget( TQWidget *parent, const char *name = 0 ); }; @@ -40,7 +40,7 @@ namespace KBibTeX class WebQueryBibSonomy : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryBibSonomy( TQWidget* parent ); virtual ~WebQueryBibSonomy(); diff --git a/src/webquerycitebase.h b/src/webquerycitebase.h index e8dec2f..8d3e961 100644 --- a/src/webquerycitebase.h +++ b/src/webquerycitebase.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryCitebaseWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCitebaseWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryCitebase : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryCitebase( TQWidget* parent ); virtual ~WebQueryCitebase(); diff --git a/src/webqueryciteseerx.cpp b/src/webqueryciteseerx.cpp index 88d5af6..f84551e 100644 --- a/src/webqueryciteseerx.cpp +++ b/src/webqueryciteseerx.cpp @@ -309,7 +309,7 @@ namespace KBibTeX m_currentParser = m_queryQueue.front().parser; TDEIO::Job *job = TDEIO::storedGet( m_queryQueue.front().url, FALSE, FALSE ); m_queryQueue.pop_front(); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( getData( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( getData( TDEIO::Job * ) ) ); } } diff --git a/src/webqueryciteseerx.h b/src/webqueryciteseerx.h index fad8d60..78a88f4 100644 --- a/src/webqueryciteseerx.h +++ b/src/webqueryciteseerx.h @@ -40,7 +40,7 @@ namespace KBibTeX class WebQueryCiteSeerXWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCiteSeerXWidget( TQWidget *parent, const char *name = 0 ); @@ -58,7 +58,7 @@ namespace KBibTeX class WebQueryCiteSeerX : public WebQuery { - Q_OBJECT + TQ_OBJECT public: @@ -132,7 +132,7 @@ namespace KBibTeX /// List with waiting queries std::deque<DataRequest> m_queryQueue; - /// Pointer to QT-dialog. + /// Pointer to TQt dialog. WebQueryCiteSeerXWidget *m_widget; }; diff --git a/src/webquerycsb.cpp b/src/webquerycsb.cpp index 9e31e62..d2306e2 100644 --- a/src/webquerycsb.cpp +++ b/src/webquerycsb.cpp @@ -92,11 +92,11 @@ namespace KBibTeX comboBoxField = new KComboBox( false, this ); hLayout->addWidget( comboBoxField ); label->setBuddy( comboBoxField ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 5 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); vLayout->addLayout( hLayout ); @@ -112,7 +112,7 @@ namespace KBibTeX hLayout->setStretchFactor( checkBoxYear, 1 ); checkBoxYear->setChecked( true ); hLayout->addWidget( checkBoxYear ); - connect( checkBoxYear, SIGNAL( toggled( bool ) ), this, SLOT( slotYearCheckToggled() ) ); + connect( checkBoxYear, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotYearCheckToggled() ) ); comboBoxYear = new KComboBox( false, this ); hLayout->setStretchFactor( comboBoxYear, 3 ); hLayout->addWidget( comboBoxYear ); diff --git a/src/webquerycsb.h b/src/webquerycsb.h index 326c82e..0fe3d16 100644 --- a/src/webquerycsb.h +++ b/src/webquerycsb.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class WebQueryCSBWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCSBWidget( TQWidget *parent, const char *name = 0 ); @@ -62,7 +62,7 @@ namespace KBibTeX */ class WebQueryCSB : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryCSB( TQWidget* parent ); virtual ~WebQueryCSB(); diff --git a/src/webquerydblp.cpp b/src/webquerydblp.cpp index ec7001f..2ef8287 100644 --- a/src/webquerydblp.cpp +++ b/src/webquerydblp.cpp @@ -71,8 +71,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -91,8 +91,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } WebQueryDBLP::WebQueryDBLP( TQWidget* parent ): WebQuery( parent ) diff --git a/src/webquerydblp.h b/src/webquerydblp.h index b395e42..fa5ddeb 100644 --- a/src/webquerydblp.h +++ b/src/webquerydblp.h @@ -31,7 +31,7 @@ namespace KBibTeX */ class WebQueryDBLPWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryDBLPWidget( TQWidget *parent, const char *name = 0 ); TQCheckBox *checkBoxKeepEntriesSeparate; @@ -45,7 +45,7 @@ namespace KBibTeX */ class WebQueryDBLP : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryDBLP( TQWidget* parent ); virtual ~WebQueryDBLP(); diff --git a/src/webquerygooglescholar.cpp b/src/webquerygooglescholar.cpp index be55192..6747da1 100644 --- a/src/webquerygooglescholar.cpp +++ b/src/webquerygooglescholar.cpp @@ -113,8 +113,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_ncr" ), false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedStartpage( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedStartpage( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::cancelQuery() @@ -154,8 +154,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_preferences?hl=en" ), false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedLoadingSettings( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedLoadingSettings( TDEIO::Job * ) ) ); } @@ -198,8 +198,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedSavingSettings( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedSavingSettings( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::slotFinishedSavingSettings( TDEIO::Job *job ) @@ -239,8 +239,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedReceivingResultOverview( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedReceivingResultOverview( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::slotFinishedReceivingResultOverview( TDEIO::Job *job ) diff --git a/src/webquerygooglescholar.h b/src/webquerygooglescholar.h index c6bb6c3..721999c 100644 --- a/src/webquerygooglescholar.h +++ b/src/webquerygooglescholar.h @@ -35,7 +35,7 @@ namespace KBibTeX */ class WebQueryGoogleScholarWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryGoogleScholarWidget( TQWidget *parent, const char *name = 0 ); }; @@ -45,7 +45,7 @@ namespace KBibTeX */ class WebQueryGoogleScholar : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryGoogleScholar( TQWidget* parent ); virtual ~WebQueryGoogleScholar(); diff --git a/src/webqueryieeexplore.cpp b/src/webqueryieeexplore.cpp index a4fad0d..c444f47 100644 --- a/src/webqueryieeexplore.cpp +++ b/src/webqueryieeexplore.cpp @@ -175,8 +175,8 @@ namespace KBibTeX TDEIO::TransferJob *job = TDEIO::http_post( m_risURL, data.utf8(), false ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); - connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void WebQueryIEEExplore::slotData( TDEIO::Job *, const TQByteArray &data ) diff --git a/src/webqueryieeexplore.h b/src/webqueryieeexplore.h index 4c63e9c..41af1c6 100644 --- a/src/webqueryieeexplore.h +++ b/src/webqueryieeexplore.h @@ -32,7 +32,7 @@ namespace KBibTeX */ class WebQueryIEEExploreWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryIEEExploreWidget( TQWidget *parent, const char *name = 0 ); }; @@ -43,7 +43,7 @@ namespace KBibTeX class WebQueryIEEExplore : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryIEEExplore( TQWidget* parent ); virtual ~WebQueryIEEExplore(); diff --git a/src/webquerymathscinet.cpp b/src/webquerymathscinet.cpp index 1d4a89c..3a204f7 100644 --- a/src/webquerymathscinet.cpp +++ b/src/webquerymathscinet.cpp @@ -64,8 +64,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -83,8 +83,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } WebQueryMathSciNet::WebQueryMathSciNet( TQWidget* parent ): WebQuery( parent ) diff --git a/src/webquerymathscinet.h b/src/webquerymathscinet.h index 1ff3508..418c3e3 100644 --- a/src/webquerymathscinet.h +++ b/src/webquerymathscinet.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryMathSciNetWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryMathSciNetWidget( TQWidget *parent, const char *name = 0 ); @@ -42,7 +42,7 @@ namespace KBibTeX */ class WebQueryMathSciNet : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryMathSciNet( TQWidget* parent ); virtual ~WebQueryMathSciNet(); diff --git a/src/webquerypubmed.cpp b/src/webquerypubmed.cpp index 902a0a1..1aa5a50 100644 --- a/src/webquerypubmed.cpp +++ b/src/webquerypubmed.cpp @@ -148,7 +148,7 @@ namespace KBibTeX doc.setContent( &buffer ); TQDomElement docElem = doc.documentElement(); WebQueryPubMedResultParser resultParser; - connect( &resultParser, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ) ); + connect( &resultParser, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ) ); resultParser.parse( docElem ); buffer.close(); setEndSearch( WebQuery::statusSuccess ); diff --git a/src/webquerypubmed.h b/src/webquerypubmed.h index 610e831..f7322a9 100644 --- a/src/webquerypubmed.h +++ b/src/webquerypubmed.h @@ -37,7 +37,7 @@ namespace KBibTeX */ class WebQueryPubMedWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMedWidget( TQWidget *parent, const char *name = 0 ); }; @@ -59,7 +59,7 @@ namespace KBibTeX class WebQueryPubMedResultParser: public TQObject { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMedResultParser(); ~WebQueryPubMedResultParser(); @@ -81,7 +81,7 @@ namespace KBibTeX class WebQueryPubMed : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMed( TQWidget *parent ); virtual ~WebQueryPubMed(); diff --git a/src/webquerysciencedirect.cpp b/src/webquerysciencedirect.cpp index 783955d..8060650 100644 --- a/src/webquerysciencedirect.cpp +++ b/src/webquerysciencedirect.cpp @@ -87,11 +87,11 @@ namespace KBibTeX TDECompletion *completionQuery = lineEditQuery->completionObject(); hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditQuery, 7 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); @@ -106,11 +106,11 @@ namespace KBibTeX completionQuery = lineEditAuthor->completionObject(); hLayout->addWidget( lineEditAuthor ); label->setBuddy( lineEditAuthor ); - connect( clearAuthor, SIGNAL( clicked() ), lineEditAuthor, SLOT( clear() ) ); - connect( lineEditAuthor, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearAuthor, TQ_SIGNAL( clicked() ), lineEditAuthor, TQ_SLOT( clear() ) ); + connect( lineEditAuthor, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditAuthor, 7 ); - connect( lineEditAuthor, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditAuthor, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditAuthor, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditAuthor, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -123,11 +123,11 @@ namespace KBibTeX completionQuery = lineEditJournal->completionObject(); hLayout->addWidget( lineEditJournal ); label->setBuddy( lineEditJournal ); - connect( clearJournal, SIGNAL( clicked() ), lineEditJournal, SLOT( clear() ) ); - connect( lineEditJournal, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearJournal, TQ_SIGNAL( clicked() ), lineEditJournal, TQ_SLOT( clear() ) ); + connect( lineEditJournal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditJournal, 4 ); - connect( lineEditJournal, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditJournal, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditJournal, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditJournal, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); vLayout->addLayout( hLayout ); @@ -138,7 +138,7 @@ namespace KBibTeX hLayout->addWidget( lineEditVolume ); hLayout->setStretchFactor( lineEditVolume, 1 ); label->setBuddy( lineEditVolume ); - connect( lineEditVolume, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditVolume, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -148,7 +148,7 @@ namespace KBibTeX hLayout->addWidget( lineEditIssue ); label->setBuddy( lineEditIssue ); hLayout->setStretchFactor( lineEditIssue, 1 ); - connect( lineEditIssue, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditIssue, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -158,7 +158,7 @@ namespace KBibTeX hLayout->addWidget( lineEditPage ); hLayout->setStretchFactor( lineEditPage, 1 ); label->setBuddy( lineEditPage ); - connect( lineEditPage, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditPage, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -365,8 +365,8 @@ namespace KBibTeX KURL url = KURL( "http://www.sciencedirect.com/science" ); TDEIO::TransferJob *job = TDEIO::http_post( url, data.utf8(), false ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); - connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); return true; } diff --git a/src/webquerysciencedirect.h b/src/webquerysciencedirect.h index 915a193..347ad51 100644 --- a/src/webquerysciencedirect.h +++ b/src/webquerysciencedirect.h @@ -30,7 +30,7 @@ namespace KBibTeX */ class WebQueryScienceDirectWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryScienceDirectWidget( TQWidget *parent, const char *name = 0 ); @@ -53,7 +53,7 @@ namespace KBibTeX */ class WebQueryScienceDirect : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryScienceDirect( TQWidget* parent ); virtual ~WebQueryScienceDirect(); diff --git a/src/webqueryspireshep.cpp b/src/webqueryspireshep.cpp index 000df22..01c1c22 100644 --- a/src/webqueryspireshep.cpp +++ b/src/webqueryspireshep.cpp @@ -101,16 +101,16 @@ namespace KBibTeX lineEditQuery = new KLineEdit( this ); hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); m_checkBoxFetchAbstracts = new TQCheckBox( i18n( "Include abstracts from arxiv.org if available" ), this ); vLayout->addWidget( m_checkBoxFetchAbstracts ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); vLayout->addStretch( 1 ); } diff --git a/src/webqueryspireshep.h b/src/webqueryspireshep.h index bf0eed6..d257cf1 100644 --- a/src/webqueryspireshep.h +++ b/src/webqueryspireshep.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQuerySpiresHepWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQuerySpiresHepWidget( TQWidget *parent, const char *name = 0 ); @@ -46,7 +46,7 @@ namespace KBibTeX */ class WebQuerySpiresHep : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQuerySpiresHep( TQWidget* parent ); virtual ~WebQuerySpiresHep(); diff --git a/src/webqueryz3950.cpp b/src/webqueryz3950.cpp index a405ee3..f546815 100644 --- a/src/webqueryz3950.cpp +++ b/src/webqueryz3950.cpp @@ -118,11 +118,11 @@ namespace KBibTeX lineEditQuery = new KLineEdit( this ); layout->addWidget( lineEditQuery, 0, 3 ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); TDECompletion *completionQuery = lineEditQuery->completionObject(); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); label = new TQLabel( i18n( "Search in:" ), this ); layout->addWidget( label, 0, 4 ); comboBoxInAttribute = new KComboBox( false, this ); @@ -140,10 +140,10 @@ namespace KBibTeX lineEditQuery2 = new KLineEdit( this ); layout->addWidget( lineEditQuery2, 1, 3 ); label->setBuddy( lineEditQuery2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery2, SLOT( clear() ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery2, TQ_SLOT( clear() ) ); completionQuery = lineEditQuery->completionObject(); - connect( lineEditQuery2, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery2, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery2, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery2, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); label = new TQLabel( i18n( "Search in:" ), this ); layout->addWidget( label, 1, 4 ); comboBoxInAttribute2 = new KComboBox( false, this ); diff --git a/src/webqueryz3950.h b/src/webqueryz3950.h index 5fb9089..b124a8e 100644 --- a/src/webqueryz3950.h +++ b/src/webqueryz3950.h @@ -55,7 +55,7 @@ namespace KBibTeX */ class WebQueryZ3950Widget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryZ3950Widget( TQWidget *parent, const char *name = 0 ); @@ -78,7 +78,7 @@ namespace KBibTeX */ class WebQueryZ3950 : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryZ3950( TQWidget* parent ); virtual ~WebQueryZ3950(); diff --git a/src/webqueryzmath.h b/src/webqueryzmath.h index df01cf0..aa3c7f8 100644 --- a/src/webqueryzmath.h +++ b/src/webqueryzmath.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryZMATHWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryZMATHWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryZMATH : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryZMATH( TQWidget* parent ); virtual ~WebQueryZMATH(); |