diff options
Diffstat (limited to 'kbabel/kbabel')
24 files changed, 434 insertions, 434 deletions
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 4522201e..8214dcf9 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -74,11 +74,11 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent scroll->addChild(_table); layout->addWidget (scroll); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), this, TQT_SLOT (setDisabled (bool))); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), _table, TQT_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), this, TQ_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), _table, TQ_SLOT (setDisabled (bool))); TQWhatsThis::add(this, i18n("<qt><p><b>Character Selector</b></p>" diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 0ca858d3..27ac26fd 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -94,12 +94,12 @@ Hints from other translators are also sometimes contained in comments.</p>\n\ <b>Options->Show Comments</b>.</p></qt>")); commentEdit->setReadOnly(true); - connect(commentEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); + connect(commentEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); - connect(commentEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); + connect(commentEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void CommentView::update(EditCommand* cmd, bool undo) diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index de5263a9..c6839480 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -67,7 +67,7 @@ ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje "<p>You can hide the tools window by deactivating " "<b>Options->Show Tools</b>.</p></qt></qt>")); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void ContextView::updateView() diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index e0f4a612..3215a696 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -342,9 +342,9 @@ activated, you will still see a message in the statusbar. <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 404f0580..a6998eb7 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -57,8 +57,8 @@ <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> <include location="global" impldecl="in implementation">tdefontdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">showOnlyFixedFonts( bool on )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 4a7624cb..9b63f071 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -54,8 +54,8 @@ HeaderEditor::HeaderEditor(Catalog* cat,const char* name) restoreSettings(); _catalog=cat; - connect(_catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(readHeader(bool))); - connect(_catalog,TQT_SIGNAL(signalHeaderChanged()),this,TQT_SLOT(updateHeader())); + connect(_catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(readHeader(bool))); + connect(_catalog,TQ_SIGNAL(signalHeaderChanged()),this,TQ_SLOT(updateHeader())); setButtonText(User1,i18n("&Apply Settings")); setButtonWhatsThis (User1, i18n("<qt><p>This button " diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 11bf219c..13d3ce2f 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -54,8 +54,8 @@ HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell _allEdits.clear(); setNumberOfPlurals( _numberOfPlurals ); - connect( _multipleEdit, TQT_SIGNAL(currentChanged( TQWidget* )), - this, TQT_SLOT( newCurrentMultiple( TQWidget* ))); + connect( _multipleEdit, TQ_SIGNAL(currentChanged( TQWidget* )), + this, TQ_SLOT( newCurrentMultiple( TQWidget* ))); showSingle(); } @@ -189,12 +189,12 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) for( MsgMultiLineEdit* e = _allEdits.first() ; e ; e = _allEdits.next() ) { - connect( e, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), - this, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SIGNAL( textChanged() )); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SLOT( emitTextChanged() )); - connect( e, TQT_SIGNAL( cursorPositionChanged( int, int )), - this, TQT_SLOT( emitCursorPositionChanged( int, int )) ); + connect( e, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), + this, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SIGNAL( textChanged() )); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SLOT( emitTextChanged() )); + connect( e, TQ_SIGNAL( cursorPositionChanged( int, int )), + this, TQ_SLOT( emitCursorPositionChanged( int, int )) ); } showPlurals( plurals ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 2bf4b2a0..4666ba9a 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -171,8 +171,8 @@ void KBabelMW::init(KBCatalog* catalog) prefDialogs.setAutoDelete(true); _statusbarTimer = new TQTimer(this, "statusbartimer"); - connect(_statusbarTimer,TQT_SIGNAL(timeout()),this - ,TQT_SLOT(clearStatusbarMsg())); + connect(_statusbarTimer,TQ_SIGNAL(timeout()),this + ,TQ_SLOT(clearStatusbarMsg())); // FIXME: Q_ASSERT(_project); @@ -206,74 +206,74 @@ void KBabelMW::init(KBCatalog* catalog) } - connect(catalog,TQT_SIGNAL(signalUndoAvailable(bool)),this - ,TQT_SLOT(enableUndo(bool))); - connect(catalog,TQT_SIGNAL(signalRedoAvailable(bool)),this - ,TQT_SLOT(enableRedo(bool))); - connect(catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)),this - ,TQT_SLOT(setNumberOfFuzzies(uint))); - connect(catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this - ,TQT_SLOT(setNumberOfUntranslated(uint))); - connect(catalog,TQT_SIGNAL(signalTotalNumberChanged(uint)),this - ,TQT_SLOT(setNumberOfTotal(uint))); - connect(catalog,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(catalog,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); - connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableDefaults(bool))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),m_view,TQT_SLOT(newFileOpened(bool))); - connect(catalog,TQT_SIGNAL(signalModified(bool)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool))); + connect(catalog,TQ_SIGNAL(signalUndoAvailable(bool)),this + ,TQ_SLOT(enableUndo(bool))); + connect(catalog,TQ_SIGNAL(signalRedoAvailable(bool)),this + ,TQ_SLOT(enableRedo(bool))); + connect(catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)),this + ,TQ_SLOT(setNumberOfFuzzies(uint))); + connect(catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this + ,TQ_SLOT(setNumberOfUntranslated(uint))); + connect(catalog,TQ_SIGNAL(signalTotalNumberChanged(uint)),this + ,TQ_SLOT(setNumberOfTotal(uint))); + connect(catalog,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(catalog,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(catalog,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(enableDefaults(bool))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),m_view,TQ_SLOT(newFileOpened(bool))); + connect(catalog,TQ_SIGNAL(signalModified(bool)),this,TQ_SLOT(showModified(bool))); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&))); - connect(m_view,TQT_SIGNAL(signalFirstDisplayed(bool, bool)),this - ,TQT_SLOT(firstEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalLastDisplayed(bool, bool)),this - ,TQT_SLOT(lastEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyDisplayed(bool)),this - ,TQT_SLOT(fuzzyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedDisplayed(bool)),this - ,TQT_SLOT(untranslatedDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalFaultyDisplayed(bool)),this - ,TQT_SLOT(faultyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this - ,TQT_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); - connect(m_view,TQT_SIGNAL(signalFuzzyAfterwards(bool)),this - ,TQT_SLOT(hasFuzzyAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyInFront(bool)),this - ,TQT_SLOT(hasFuzzyInFront(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedAfterwards(bool)),this - ,TQT_SLOT(hasUntranslatedAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedInFront(bool)),this - ,TQT_SLOT(hasUntranslatedInFront(bool))); - connect(m_view,TQT_SIGNAL(signalErrorAfterwards(bool)),this - ,TQT_SLOT(hasErrorAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalErrorInFront(bool)),this - ,TQT_SLOT(hasErrorInFront(bool))); - connect(m_view,TQT_SIGNAL(signalBackHistory(bool)),this - ,TQT_SLOT(enableBackHistory(bool))); - connect(m_view,TQT_SIGNAL(signalForwardHistory(bool)),this - ,TQT_SLOT(enableForwardHistory(bool))); - - - connect(m_view,TQT_SIGNAL(ledColorChanged(const TQColor&)),this - ,TQT_SLOT(setLedColor(const TQColor&))); - - - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableStop(bool))); - - connect(m_view,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(m_view,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); - connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int))); - - connect(m_view,TQT_SIGNAL(signalDictionariesChanged()) - , TQT_TQOBJECT(this), TQT_SLOT(buildDictMenus())); - connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this - , TQT_SLOT(updateCursorPosition(int,int))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); + connect(m_view,TQ_SIGNAL(signalFirstDisplayed(bool, bool)),this + ,TQ_SLOT(firstEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalLastDisplayed(bool, bool)),this + ,TQ_SLOT(lastEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyDisplayed(bool)),this + ,TQ_SLOT(fuzzyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedDisplayed(bool)),this + ,TQ_SLOT(untranslatedDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalFaultyDisplayed(bool)),this + ,TQ_SLOT(faultyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this + ,TQ_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); + connect(m_view,TQ_SIGNAL(signalFuzzyAfterwards(bool)),this + ,TQ_SLOT(hasFuzzyAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyInFront(bool)),this + ,TQ_SLOT(hasFuzzyInFront(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedAfterwards(bool)),this + ,TQ_SLOT(hasUntranslatedAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedInFront(bool)),this + ,TQ_SLOT(hasUntranslatedInFront(bool))); + connect(m_view,TQ_SIGNAL(signalErrorAfterwards(bool)),this + ,TQ_SLOT(hasErrorAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalErrorInFront(bool)),this + ,TQ_SLOT(hasErrorInFront(bool))); + connect(m_view,TQ_SIGNAL(signalBackHistory(bool)),this + ,TQ_SLOT(enableBackHistory(bool))); + connect(m_view,TQ_SIGNAL(signalForwardHistory(bool)),this + ,TQ_SLOT(enableForwardHistory(bool))); + + + connect(m_view,TQ_SIGNAL(ledColorChanged(const TQColor&)),this + ,TQ_SLOT(setLedColor(const TQColor&))); + + + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(enableStop(bool))); + + connect(m_view,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(m_view,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(m_view,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + + connect(m_view,TQ_SIGNAL(signalDictionariesChanged()) + , this, TQ_SLOT(buildDictMenus())); + connect(m_view,TQ_SIGNAL(signalCursorPosChanged(int,int)), this + , TQ_SLOT(updateCursorPosition(int,int))); if(!catalog->currentURL().isEmpty()) { @@ -296,14 +296,14 @@ void KBabelMW::init(KBCatalog* catalog) // the earlier created TDEAction for "clear_bookmarks" is now reconnected TDEAction* action = actionCollection()->action("clear_bookmarks"); if (action) { - action->disconnect(TQT_SIGNAL(activated())); - connect(action, TQT_SIGNAL(activated()), - bmHandler, TQT_SLOT(slotClearBookmarks())); + action->disconnect(TQ_SIGNAL(activated())); + connect(action, TQ_SIGNAL(activated()), + bmHandler, TQ_SLOT(slotClearBookmarks())); } - connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotOpenBookmark(int))); - connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)), - bmHandler, TQT_SLOT(slotClearBookmarks())); + connect(bmHandler, TQ_SIGNAL(signalBookmarkSelected(int)), + this, TQ_SLOT(slotOpenBookmark(int))); + connect(m_view, TQ_SIGNAL(signalNewFileOpened(KURL)), + bmHandler, TQ_SLOT(slotClearBookmarks())); _config = TDESharedConfig::openConfig( "kbabelrc" ); restoreSettings(); @@ -335,7 +335,7 @@ void KBabelMW::init(KBCatalog* catalog) "set to %1. You may want to change this setting " "according to the settings of your language team.").arg(encodingStr)); - TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure())); + TQTimer::singleShot(1,this,TQ_SLOT(projectConfigure())); } _config->writeEntry("Version",VERSION); @@ -404,289 +404,289 @@ void KBabelMW::setupActions() TDEAction* action; // the file menu - action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection()); + a_recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); a_recent->setMaxItems(MAX_RECENT); - action = KStdAction::revert(TQT_TQOBJECT(m_view),TQT_SLOT(revertToSaved()),actionCollection()); - action=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - action = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); - action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), + action = KStdAction::revert(m_view,TQ_SLOT(revertToSaved()),actionCollection()); + action=KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + action = new TDEAction(i18n("Save Sp&ecial..."), 0, this, TQ_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), + action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQ_SLOT(setFilePackage()), actionCollection(), "set_package" ); - action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection()); + action = KStdAction::mail(this, TQ_SLOT(fileMail()), actionCollection()); - action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), + action = new TDEAction(i18n("&New View"), 0, this, TQ_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), + action = new TDEAction(i18n("New &Window"), 0, this, TQ_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); action->setShortcut( TDEStdAccel::openNew() ); - action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + action = KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); // the edit menu - action = KStdAction::undo(TQT_TQOBJECT(m_view), TQT_SLOT(undo()), actionCollection()); - action = KStdAction::redo(TQT_TQOBJECT(m_view), TQT_SLOT(redo()), actionCollection()); - action = KStdAction::cut(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCut()), actionCollection()); - action = KStdAction::copy(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCopy()), actionCollection()); - action = KStdAction::paste(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalPaste()), actionCollection()); - action = KStdAction::selectAll(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(TQT_TQOBJECT(m_view), TQT_SLOT(find()), actionCollection()); - action = KStdAction::findNext(TQT_TQOBJECT(m_view), TQT_SLOT(findNext()), actionCollection()); - action = KStdAction::findPrev(TQT_TQOBJECT(m_view), TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(TQT_TQOBJECT(m_view), TQT_SLOT(replace()), actionCollection()); - - action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" ); - - action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view) - ,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); + action = KStdAction::undo(m_view, TQ_SLOT(undo()), actionCollection()); + action = KStdAction::redo(m_view, TQ_SLOT(redo()), actionCollection()); + action = KStdAction::cut(m_view, TQ_SIGNAL(signalCut()), actionCollection()); + action = KStdAction::copy(m_view, TQ_SIGNAL(signalCopy()), actionCollection()); + action = KStdAction::paste(m_view, TQ_SIGNAL(signalPaste()), actionCollection()); + action = KStdAction::selectAll(m_view, TQ_SIGNAL(signalSelectAll()), actionCollection()); + action = KStdAction::find(m_view, TQ_SLOT(find()), actionCollection()); + action = KStdAction::findNext(m_view, TQ_SLOT(findNext()), actionCollection()); + action = KStdAction::findPrev(m_view, TQ_SLOT(findPrev()), actionCollection()); + action = KStdAction::replace(m_view, TQ_SLOT(replace()), actionCollection()); + + action = KStdAction::clear( m_view, TQ_SLOT(clear()), actionCollection(), "clear" ); + + action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view + ,TQ_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", - CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()), + CTRL+ALT+Key_Space, m_view, TQ_SLOT(search2msgstr()), actionCollection(), "search2msgstr"); - action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view) - ,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); - action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview) - ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - - a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view) - , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); - action = new TDEAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), + action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view + ,TQ_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); + action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview + ,TQ_SLOT(emitChar()), actionCollection(), "char2msgstr"); + + a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view + , TQ_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQ_SLOT(editHeader()), actionCollection(), "edit_edit_header"); action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag()) + , m_view, TQ_SLOT(insertNextTag()) , actionCollection(),"insert_next_tag"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid()) + , m_view, TQ_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); TDEActionMenu *actionMenu= new TDEActionMenu(i18n("Inser&t Tag"), "insert_tag" , actionCollection(),"insert_tag"); m_view->setTagsMenu(actionMenu->popupMenu()); - connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),actionMenu - ,TQT_SLOT(setEnabled(bool))); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag())); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextTag())); action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less - , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); + , m_view, TQ_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M - , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag()) + , m_view, TQ_SLOT(skipToNextTag()) , actionCollection(),"move_to_next_tag"); action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B - , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag()) + , m_view, TQ_SLOT(skipToPreviousTag()) , actionCollection(),"move_to_prev_tag"); action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg()) + , m_view, TQ_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); - connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextArgAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); actionMenu= new TDEActionMenu(i18n("Inser&t Argument"), "insert_arg" , actionCollection(),"insert_arg"); m_view->setArgsMenu(actionMenu->popupMenu()); - connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),actionMenu - ,TQT_SLOT(setEnabled(bool))); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg())); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextArg())); action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent - , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); + , m_view, TQ_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); // next, the go-menu action = new TDEAction(i18n("&Previous"), "go-previous", - TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), + TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQ_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); action = new TDEAction(i18n("&Next"), "go-next", - TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), + TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQ_SLOT(gotoNext()), actionCollection(),"go_next_entry"); - action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection()); + action = KStdAction::goTo(m_view, TQ_SLOT(gotoEntry()), actionCollection()); action->setShortcut( TDEStdAccel::gotoLine()); - action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection()); + action = KStdAction::firstPage(m_view, TQ_SLOT(gotoFirst()),actionCollection()); action->setText(i18n("&First Entry")); action->setShortcut(CTRL+ALT+Key_Home); - action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection()); + action = KStdAction::lastPage(m_view, TQ_SLOT(gotoLast()),actionCollection()); action->setText(i18n("&Last Entry")); action->setShortcut(CTRL+ALT+Key_End); a_prevFoU = new TDEAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans", - CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); + CTRL+SHIFT+Key_Prior, m_view, + TQ_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", - CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); + CTRL+SHIFT+Key_Next, m_view, + TQ_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", - CTRL+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); + CTRL+Key_Prior, m_view, + TQ_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", - CTRL+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); + CTRL+Key_Next, m_view, + TQ_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", - ALT+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); + ALT+Key_Prior, m_view, + TQ_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", - ALT+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); + ALT+Key_Next, m_view, + TQ_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action = new TDEAction(i18n("Previo&us Error"), "preverror", - SHIFT+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); + SHIFT+Key_Prior, m_view, + TQ_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); action = new TDEAction(i18n("Next Err&or"), "nexterror", - SHIFT+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); - action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view), - TQT_SLOT(backHistory()),actionCollection(), "go_back_history"); - action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view), - TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); + SHIFT+Key_Next, m_view, + TQ_SLOT(gotoNextError()),actionCollection(), "go_next_error"); + action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view, + TQ_SLOT(backHistory()),actionCollection(), "go_back_history"); + action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view, + TQ_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); // the search menu actionMenu=new TDEActionMenu(i18n("&Find Text"), "transsearch",actionCollection(),"dict_search_all"); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch())); - dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); - connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) - , TQT_SLOT(startSearch(const TQString))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSearch())); + dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(dictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSearch(const TQString))); actionMenu=new TDEActionMenu(i18n("F&ind Selected Text"), "transsearch",actionCollection(),"dict_search_selected"); - connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSelectionSearch())); - selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); - connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) - , TQT_SLOT(startSelectionSearch(const TQString))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSelectionSearch())); + selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(selectionDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSelectionSearch(const TQString))); actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"), "transsearch",actionCollection(),"dict_edit"); - editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); - connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) - , TQT_SLOT(editDictionary(const TQString))); + editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(editDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(editDictionary(const TQString))); actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"), "transsearch",actionCollection(),"dict_configure"); - configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); - connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) - , TQT_SLOT(configureDictionary(const TQString))); + configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(configDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(configureDictionary(const TQString))); actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch", actionCollection(), "dict_about"); - aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); - connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) - , TQT_SLOT(aboutDictionary(const TQString))); + aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(aboutDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(aboutDictionary(const TQString))); buildDictMenus(); // the project menu action = new TDEAction(i18n("&New..."), "document-new" - , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() + , this, TQ_SLOT(projectNew()),actionCollection() ,"project_new"); action = new TDEAction(i18n("&Open..."), "document-open" - , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() + , this, TQ_SLOT(projectOpen()),actionCollection() ,"project_open"); action = new TDEAction(i18n("C&lose"), "window-close" - , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() + , this, TQ_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); action = new TDEAction(i18n("&Configure..."), "configure" - , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() + , this, TQ_SLOT(projectConfigure()),actionCollection() ,"project_settings"); - a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQ_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); // the tools menu action = new TDEAction(i18n("&Spell Check..."), "tools-check-spelling", CTRL+Key_I - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection() + , m_view, TQ_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection() + , m_view, TQ_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection() + , m_view, TQ_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); TDEToggleAction *toggleAction; toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0 ,actionCollection(), "diff_toggleDiff"); - connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_view), TQT_SLOT(toggleAutoDiff(bool))); - connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction - , TQT_SLOT(setChecked(bool))); + connect(toggleAction,TQ_SIGNAL(toggled(bool)), m_view, TQ_SLOT(toggleAutoDiff(bool))); + connect(m_view,TQ_SIGNAL(signalDiffEnabled(bool)), toggleAction + , TQ_SLOT(setChecked(bool))); toggleAction->setChecked(m_view->autoDiffEnabled()); action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5 - , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection() + , m_view, TQ_SLOT(diff()),actionCollection() ,"diff_diff"); action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6 - , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection() + , m_view, TQ_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0 - , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection() + , m_view, TQ_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); action = new TDEAction(i18n("&Rough Translation..."), 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection() + , m_view, TQ_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); - action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), - TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); + action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this, + TQ_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); + new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQ_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new TDEAction( i18n("&Word Count"), 0, m_view, TQ_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); - KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection()); + KStdAction::configureToolbars(this,TQ_SLOT(optionsEditToolbars()),actionCollection()); - KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection()); + KStdAction::keyBindings(guiFactory(),TQ_SLOT(configureShortcuts()),actionCollection()); + KStdAction::preferences(this,TQ_SLOT(optionsPreferences()),actionCollection()); setStandardToolBarMenuEnabled ( true ); - action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, TQT_TQOBJECT(m_view), - TQT_SLOT(stopSearch()),actionCollection(), "stop_search"); + action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, m_view, + TQ_SLOT(stopSearch()),actionCollection(), "stop_search"); action->setEnabled(false); - new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), - TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); + new TDEAction(i18n("&Gettext Info"), 0, this, + TQ_SLOT(gettextHelp()), actionCollection(), "help_gettext"); // the bookmarks menu - action = KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + action = KStdAction::addBookmark(this, TQ_SLOT(slotAddBookmark()), actionCollection(), "add_bookmark"); action->setEnabled(false); // this action is now connected to dummySlot(), and later reconnected // to bmHandler after that object actually is created - new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), + new TDEAction(i18n("Clear Bookmarks"), 0, this, TQ_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -759,20 +759,20 @@ void KBabelMW::setupDynamicActions() TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( - tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), + tools, m_view, TQ_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), "validate", false, actionCollection() ); TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); - TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), - TQT_SLOT(checkAll()),actionCollection(), "check_all"); + TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view, + TQ_SLOT(checkAll()),actionCollection(), "check_all"); ac->setEnabled(false); m_menu->insert(ac); m_menu->insert( new TDEActionSeparator() ); - ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), - TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax"); + ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view, + TQ_SLOT(checkSyntax()),actionCollection(), "check_syntax"); ac->setEnabled(false); m_menu->insert(ac); @@ -801,7 +801,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -833,7 +833,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -844,7 +844,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // insert tools @@ -923,7 +923,7 @@ bool KBabelMW::queryClose() { if(m_view->isSearching()) { - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(quit())); + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(quit())); m_view->stopSearch(); return false; } @@ -932,7 +932,7 @@ bool KBabelMW::queryClose() { // stop the activity and try again m_view->catalog()->stop(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT( close() )); + TQTimer::singleShot(0, this, TQ_SLOT( close() )); return false; } @@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url) void KBabelMW::fileSave() { // do it asynchronously due to tdelibs bug - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() )); + TQTimer::singleShot( 0, this, TQ_SLOT( fileSave_internal() )); } void KBabelMW::fileSave_internal() @@ -1090,7 +1090,7 @@ void KBabelMW::fileSave_internal() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1107,7 +1107,7 @@ void KBabelMW::fileSaveAs() m_view->saveFileAs(); KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1121,7 +1121,7 @@ void KBabelMW::fileSaveSpecial() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), "View" ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -1198,8 +1198,8 @@ void KBabelMW::optionsPreferences() _prefDialog = new KBabelPreferences(m_view->dictionaries()); prefDialogs.append(_prefDialog); - connect(_prefDialog,TQT_SIGNAL(settingsChanged()) - ,m_view,TQT_SLOT(updateSettings())); + connect(_prefDialog,TQ_SIGNAL(settingsChanged()) + ,m_view,TQ_SLOT(updateSettings())); } int prefHeight=_prefDialog->height(); @@ -1242,7 +1242,7 @@ void KBabelMW::openCatalogManager() TQCString service; TQString result; - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); // find out, if there is a running catalog manager QCStringList apps = client->registeredApplications(); @@ -1261,7 +1261,7 @@ void KBabelMW::openCatalogManager() { TQString prog = "catalogmanager"; TQString url = ""; - if( kapp->startServiceByDesktopName(prog,url, &result,&service)) + if( tdeApp->startServiceByDesktopName(prog,url, &result,&service)) { KMessageBox::error(this, i18n("Unable to use TDELauncher to start " "Catalog Manager. You should check the installation of TDE.\n" @@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) } if(p) - kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p)); + kb = static_cast<KBabelMW*>(p); } return kb; @@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project) } if(p) - kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p)); + kb = static_cast<KBabelMW*>(p); } return kb; @@ -1651,7 +1651,7 @@ void KBabelMW::spellcheckMoreFiles(TQStringList filelist) { if( filelist.isEmpty() ) return; _toSpellcheck = filelist; - connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(this), TQT_SLOT( spellcheckDone(int))); + connect( m_view, TQ_SIGNAL( signalSpellcheckDone(int) ), this, TQ_SLOT( spellcheckDone(int))); spellcheckDone( KS_IGNORE ); // use something else than KS_STOP } @@ -1659,7 +1659,7 @@ void KBabelMW::spellcheckDone( int result) { if( _toSpellcheck.isEmpty() || result == KS_STOP) { - disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), TQT_TQOBJECT(this), TQT_SLOT(spellcheckDone( int))); + disconnect( m_view, TQ_SIGNAL( signalSpellcheckDone(int)), this, TQ_SLOT(spellcheckDone( int))); KMessageBox::information( this, i18n("MessageBox text", "Spellchecking of multiple files is finished."), i18n("MessageBox caption", "Spellcheck Done")); } @@ -1670,7 +1670,7 @@ void KBabelMW::spellcheckDone( int result) if( m_view->isModified() ) fileSave(); open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; - TQTimer::singleShot( 1, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti())); + TQTimer::singleShot( 1, m_view, TQ_SLOT(spellcheckAllMulti())); } } @@ -1792,8 +1792,8 @@ void KBabelMW::projectConfigure() if(!_projectDialog) { _projectDialog = new ProjectDialog(_project); - connect (_projectDialog, TQT_SIGNAL (settingsChanged()) - , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings())); + connect (_projectDialog, TQ_SIGNAL (settingsChanged()) + , m_view, TQ_SLOT (updateProjectSettings())); } int prefHeight=_projectDialog->height(); diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 11c0b8ee..626b5ae7 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -61,10 +61,10 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) // this contains a custom widget for tool selection, set it up TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); _editorPage->_kcfg_AutoCheckTools->loadTools( "validate", tools ); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( added( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( removed( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( added( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( removed( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); addPage(_searchPage = new SearchPreferences(0, "search") , i18n("title of page in preferences dialog","Search") @@ -78,8 +78,8 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) _searchPage->_kcfg_DefaultModule->insertItem(info->name); } moduleList = ml; - connect( _searchPage->_kcfg_DefaultModule, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT (updateButtons())); + connect( _searchPage->_kcfg_DefaultModule, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT (updateButtons())); addPage(new EditorDiffPreferences(0, "diff") ,i18n("title of page in preferences dialog","Diff") @@ -103,7 +103,7 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) void KBabelPreferences::slotHelp() { //TODO - kapp->invokeHelp("Preferences",""); + tdeApp->invokeHelp("Preferences",""); } bool KBabelPreferences::hasChanged() diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp index 848d506f..c3526960 100644 --- a/kbabel/kbabel/kbabelsplash.cpp +++ b/kbabel/kbabel/kbabelsplash.cpp @@ -36,7 +36,7 @@ #include <tqfontmetrics.h> #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KBabelSplash* KBabelSplash::instance = 0; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index a96c5a72..adb07ac7 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -201,57 +201,57 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project msgstrEdit->setReadOnly(true); dictBox->setEnabled(false); - connect(this, TQT_SIGNAL(signalNewFileOpened(KURL)), - m_cataloglistview, TQT_SLOT(slotNewFileOpened())); + connect(this, TQ_SIGNAL(signalNewFileOpened(KURL)), + m_cataloglistview, TQ_SLOT(slotNewFileOpened())); - connect(msgstrEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this - ,TQT_SIGNAL(signalMsgstrChanged())); + connect(msgstrEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this + ,TQ_SIGNAL(signalMsgstrChanged())); - connect(msgstrEdit,TQT_SIGNAL(textChanged(const TQString&)),m_cataloglistview - ,TQT_SLOT(msgstrChanged(const TQString&))); + connect(msgstrEdit,TQ_SIGNAL(textChanged(const TQString&)),m_cataloglistview + ,TQ_SLOT(msgstrChanged(const TQString&))); - connect(this,TQT_SIGNAL(signalMsgstrChanged()),this,TQT_SLOT(autoCheck())); - connect(msgstrEdit,TQT_SIGNAL(currentFormChanged(uint)), this - ,TQT_SLOT(msgstrPluralFormChanged(uint))); - - connect(msgidLabel,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - connect(msgstrEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - - connect(dictBox,TQT_SIGNAL(searchStarted()),this - ,TQT_SLOT(forwardSearchStart())); - connect(dictBox, TQT_SIGNAL(progressStarts(const TQString&)), this - ,TQT_SLOT(forwardProgressStart(const TQString&))); - connect(dictBox,TQT_SIGNAL(progressed(int)),this - ,TQT_SIGNAL(signalProgress(int))); - connect(dictBox,TQT_SIGNAL(searchStopped()),this - ,TQT_SLOT(forwardSearchStop())); - connect(dictBox,TQT_SIGNAL(progressEnds()),this - ,TQT_SIGNAL(signalClearProgressBar())); - - connect(dictBox,TQT_SIGNAL(modulesChanged()),this, - TQT_SIGNAL(signalDictionariesChanged())); - connect(dictBox,TQT_SIGNAL(errorInModule(const TQString&)),this - ,TQT_SLOT(showError(const TQString&))); - - connect(_catalog,TQT_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), - this, TQT_SLOT(setNewLanguage())); - - connect(_catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)), - this, TQT_SLOT(checkFuzzies())); - connect(_catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)), - this, TQT_SLOT(checkUntranslated())); + connect(this,TQ_SIGNAL(signalMsgstrChanged()),this,TQ_SLOT(autoCheck())); + connect(msgstrEdit,TQ_SIGNAL(currentFormChanged(uint)), this + ,TQ_SLOT(msgstrPluralFormChanged(uint))); + + connect(msgidLabel,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + connect(msgstrEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + + connect(dictBox,TQ_SIGNAL(searchStarted()),this + ,TQ_SLOT(forwardSearchStart())); + connect(dictBox, TQ_SIGNAL(progressStarts(const TQString&)), this + ,TQ_SLOT(forwardProgressStart(const TQString&))); + connect(dictBox,TQ_SIGNAL(progressed(int)),this + ,TQ_SIGNAL(signalProgress(int))); + connect(dictBox,TQ_SIGNAL(searchStopped()),this + ,TQ_SLOT(forwardSearchStop())); + connect(dictBox,TQ_SIGNAL(progressEnds()),this + ,TQ_SIGNAL(signalClearProgressBar())); + + connect(dictBox,TQ_SIGNAL(modulesChanged()),this, + TQ_SIGNAL(signalDictionariesChanged())); + connect(dictBox,TQ_SIGNAL(errorInModule(const TQString&)),this + ,TQ_SLOT(showError(const TQString&))); + + connect(_catalog,TQ_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), + this, TQ_SLOT(setNewLanguage())); + + connect(_catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)), + this, TQ_SLOT(checkFuzzies())); + connect(_catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)), + this, TQ_SLOT(checkUntranslated())); if(buildLeds) { - connect(this,TQT_SIGNAL(signalFuzzyDisplayed(bool)) - ,this,TQT_SLOT(toggleFuzzyLed(bool))); - connect(this,TQT_SIGNAL(signalUntranslatedDisplayed(bool)) - ,this,TQT_SLOT(toggleUntransLed(bool))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,this,TQT_SLOT(toggleErrorLed(bool))); + connect(this,TQ_SIGNAL(signalFuzzyDisplayed(bool)) + ,this,TQ_SLOT(toggleFuzzyLed(bool))); + connect(this,TQ_SIGNAL(signalUntranslatedDisplayed(bool)) + ,this,TQ_SLOT(toggleUntransLed(bool))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,this,TQ_SLOT(toggleErrorLed(bool))); } _dropMenu = new TQPopupMenu(this); @@ -261,8 +261,8 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project readSettings(_config); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); if(!_catalog->currentURL().isEmpty()) { @@ -356,10 +356,10 @@ of the currently displayed entry.</p></qt>")); m_mainwindow->setMainDockWidget(mainDock); // master dockwidget mainDock->show (); m_mainwindow->setView (mainDock); - connect (this, TQT_SIGNAL (signalCopy ()), this, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), this, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), this, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), this, TQT_SLOT (selectAll ())); + connect (this, TQ_SIGNAL (signalCopy ()), this, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), this, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), this, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), this, TQ_SLOT (selectAll ())); KDockWidget* comment_dock = m_mainwindow->createDockWidget( "Comment", TQPixmap ()); //i18n: translators: Dock window caption @@ -372,11 +372,11 @@ of the currently displayed entry.</p></qt>")); KDockWidget::DockRight, // dock site 20 ); // relation target/this (in percent) comment_dock->show (); - connect (this, TQT_SIGNAL (signalCopy ()), m_commentview, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), m_commentview, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), m_commentview, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), m_commentview, TQT_SLOT (textSelectAll ())); - m_commentview->installEventFilter( TQT_TQOBJECT(this) ); + connect (this, TQ_SIGNAL (signalCopy ()), m_commentview, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), m_commentview, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), m_commentview, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), m_commentview, TQ_SLOT (textSelectAll ())); + m_commentview->installEventFilter( this ); // build the msgstr widget tempWidget=new TQWidget(this,"msgstrWidget"); @@ -550,30 +550,30 @@ of the currently displayed entry.</p></qt>")); 20 ); dock->show (); - connect(m_cataloglistview,TQT_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) - ,this,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_commentview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_contextview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_taglistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_sourceview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_errorlistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,m_errorlistview,TQT_SLOT(updateView())); - connect(m_charselectorview, TQT_SIGNAL( characterDoubleClicked(TQChar) ) - ,this, TQT_SLOT( insertChar(TQChar) )); - connect(m_taglistview,TQT_SIGNAL(signalTagSelected(const TQString&)) - , this, TQT_SLOT(insertTagFromTool(const TQString&))); - connect(m_taglistview,TQT_SIGNAL(signalHighlightedTagChanged(int)) - , this, TQT_SLOT(skipToTagFromTool(int))); - connect(this, TQT_SIGNAL(signalNextTag(int)) - , m_taglistview, TQT_SLOT(highlightTag(int))); - connect(m_commentview,TQT_SIGNAL(signalCursorPosChanged(int,int)) - , m_mainwindow, TQT_SLOT(updateCursorPosition(int,int))); + connect(m_cataloglistview,TQ_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) + ,this,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_commentview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_contextview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_taglistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_sourceview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_errorlistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,m_errorlistview,TQ_SLOT(updateView())); + connect(m_charselectorview, TQ_SIGNAL( characterDoubleClicked(TQChar) ) + ,this, TQ_SLOT( insertChar(TQChar) )); + connect(m_taglistview,TQ_SIGNAL(signalTagSelected(const TQString&)) + , this, TQ_SLOT(insertTagFromTool(const TQString&))); + connect(m_taglistview,TQ_SIGNAL(signalHighlightedTagChanged(int)) + , this, TQ_SLOT(skipToTagFromTool(int))); + connect(this, TQ_SIGNAL(signalNextTag(int)) + , m_taglistview, TQ_SLOT(highlightTag(int))); + connect(m_commentview,TQ_SIGNAL(signalCursorPosChanged(int,int)) + , m_mainwindow, TQ_SLOT(updateCursorPosition(int,int))); } KBabelView *KBabelView::viewForURL(const KURL& url, const TQString project) @@ -684,8 +684,8 @@ void KBabelView::readSettings(TDEConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } setupAutoCheckTools(); @@ -770,7 +770,7 @@ void KBabelView::readProject(Project::Ptr project) spell2.config->setEncoding(_spellcheckSettings.spellEncoding); spell2.config->setDictionary(_spellcheckSettings.spellDict); - spell2.tdespell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)), + spell2.tdespell= new KSpell(this, "", this, TQ_SLOT(dummy(KSpell *)), spell2.config, false, false); if(spell2.tdespell->status() == KSpell::Error) kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl; @@ -853,13 +853,13 @@ void KBabelView::updateSettings() _errorLed->setColor(KBabelSettings::ledColor()); } - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -1244,7 +1244,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo if ( _autoSaveDelay ) { if ( !autoSaveTimer ) { autoSaveTimer = new TQTimer( this, "AUTOSAVE TIMER" ); - connect( autoSaveTimer, TQT_SIGNAL( timeout( ) ), this, TQT_SLOT( slotAutoSaveTimeout( ) ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout( ) ), this, TQ_SLOT( slotAutoSaveTimeout( ) ) ); } autoSaveTimer->stop( ); autoSaveTimer->start( 1000 * 60 * _autoSaveDelay ); @@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); @@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->blockSignals(false); @@ -1862,7 +1862,7 @@ void KBabelView::updateEditor(int form, bool delay) { if (delay) { - TQTimer::singleShot(0, this, TQT_SLOT (startSearch())); + TQTimer::singleShot(0, this, TQ_SLOT (startSearch())); } else { @@ -2083,7 +2083,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } if( isModified() && !opts.askForSave ) saveFile(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data, replyData; TQCString replyType; bool morefiles = false; // more files to lookup in @@ -2518,9 +2518,9 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(opts.ask) { @@ -2615,7 +2615,7 @@ void KBabelView::replaceAll() while(success) { - kapp->processEvents(100); + tdeApp->processEvents(100); _replacesTotal++; @@ -2749,9 +2749,9 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(options.ask) { @@ -3335,7 +3335,7 @@ void KBabelView::checkUntranslated() void KBabelView::autoRemoveFuzzyStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); //removeFuzzyStatus(); } @@ -3888,7 +3888,7 @@ void KBabelView::spellcheck() if(emitProgress) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); } uint total=last-first+1; @@ -3900,7 +3900,7 @@ void KBabelView::spellcheck() lastPercent++; emit signalProgress(lastPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } TQStringList msgs=_catalog->msgstr(i); @@ -3943,7 +3943,7 @@ void KBabelView::spellcheck() _dontBeep=true; spell.tdespell= new KSpell (this, i18n("Spellcheck"), - TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); + this, TQ_SLOT(spellStart(KSpell *)), spell.config, true, true); if( spell.tdespell->status() == KSpell::Error ) { KMessageBox::error( this, i18n("KBabel cannot start spell checker. " @@ -3951,20 +3951,20 @@ void KBabelView::spellcheck() return; } - connect(spell.tdespell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone())); + connect(spell.tdespell, TQ_SIGNAL(death()),this, TQ_SLOT(spellCleanDone())); - connect(spell.tdespell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList & + connect(spell.tdespell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList & , unsigned int)), this - , TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); + , TQ_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); - connect(spell.tdespell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) - , this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); + connect(spell.tdespell, TQ_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) + , this, TQ_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); - connect(spell.tdespell,TQT_SIGNAL(ignoreall(const TQString &)) - , this, TQT_SLOT(spellAddIgnore(const TQString &))); + connect(spell.tdespell,TQ_SIGNAL(ignoreall(const TQString &)) + , this, TQ_SLOT(spellAddIgnore(const TQString &))); - connect(spell.tdespell, TQT_SIGNAL(done(bool)) - , this, TQT_SLOT(spellResult(bool))); + connect(spell.tdespell, TQ_SIGNAL(done(bool)) + , this, TQ_SLOT(spellResult(bool))); spell.tdespell->setAutoDelete(true); // let KSpell handle delete } @@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *) if(spell.ignoreList.count() > 0) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); uint total = spell.ignoreList.count(); uint oldPercent=0; @@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *) { oldPercent++; emit signalProgress(oldPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } spell.tdespell->ignore(*it); @@ -4368,7 +4368,7 @@ void KBabelView::spellResult(bool flag) spell.tdespell->cleanUp(); emit signalSpellcheckDone(s); - TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct())); + TQTimer::singleShot(0,this,TQ_SLOT(cleanUpSpellStruct())); } @@ -4458,16 +4458,16 @@ void KBabelView::slotAutoSaveTimeout( ) void KBabelView::useProject (Project::Ptr project) { // FIXME: close the current project first - disconnect (_project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + disconnect (_project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); _project = project; _catalog->useProject(_project); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); } #include "kbabelview.moc" diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 5089f563..cacc1290 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -273,7 +273,7 @@ void KBabelView::setTagsMenu(TQPopupMenu *menu) { _tagsMenu=menu; - connect(_tagsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertTag(int))); + connect(_tagsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertTag(int))); } void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool clearFirst) @@ -407,7 +407,7 @@ void KBabelView::setArgsMenu(TQPopupMenu *menu) { _argsMenu=menu; - connect(_argsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertArg(int))); + connect(_argsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertArg(int))); } @@ -706,7 +706,7 @@ bool KBabelView::openDiffFile(bool autoDiff) Catalog cat; - connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); + connect(&cat,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); ConversionStatus stat = cat.openURL(url); diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 488a4281..2f128fc8 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.cpp @@ -95,7 +95,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), - this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); + this, TQ_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } void KBabelBookmarkHandler::addBookmark(int msgindex, TQString msgtext) diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index 40822862..fea743b7 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -52,7 +52,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe layout->addWidget(m_listview); layout->setStretchFactor(m_listview,1); - connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(m_listview,TQ_SIGNAL(selectionChanged(TQListViewItem *)), this,TQ_SLOT(selectionChanged(TQListViewItem *))); } KBCatalogListView::~KBCatalogListView() diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 5507e9db..361b967c 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -80,8 +80,8 @@ void KBCatalogListViewItem::setup() widthChanged(); - m_doc_msgid.reset(0); - m_doc_msgstr.reset(0); + m_doc_msgid.reset(); + m_doc_msgstr.reset(); makeDocAvailable(); @@ -170,7 +170,7 @@ void KBCatalogListViewItem::paintMsgStrCell(TQPainter* p, const TQColorGroup& cg void KBCatalogListViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align) { - assert(m_doc_msgid.get() && m_doc_msgstr.get() && p); + assert(m_doc_msgid && m_doc_msgstr && p); // paint background (empty text) @@ -191,7 +191,7 @@ void KBCatalogListViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, void KBCatalogListViewItem::makeDocAvailable() { - if (m_doc_msgid.get() && m_doc_msgstr.get()) + if (m_doc_msgid && m_doc_msgstr) return; assert(listView()); diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 6384360f..a29ca9ba 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -65,8 +65,8 @@ private: TQString m_msgid; TQString m_msgstr; - std::auto_ptr<TQSimpleRichText> m_doc_msgid; - std::auto_ptr<TQSimpleRichText> m_doc_msgstr; + std::unique_ptr<TQSimpleRichText> m_doc_msgid; + std::unique_ptr<TQSimpleRichText> m_doc_msgstr; }; #endif diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index 1871b221..990eea93 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -49,8 +49,8 @@ KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr _currentIndex=1; // here we use 1 to accept update at opening a file - connect ( _project, TQT_SIGNAL (signalSettingsChanged()), this, TQT_SLOT (readProjectSettings()) ); - connect ( _catalog, TQT_SIGNAL (signalFileOpened(bool)), this, TQT_SLOT (readFileSettings() ) ); + connect ( _project, TQ_SIGNAL (signalSettingsChanged()), this, TQ_SLOT (readProjectSettings()) ); + connect ( _catalog, TQ_SIGNAL (signalFileOpened(bool)), this, TQ_SLOT (readFileSettings() ) ); readProjectSettings(); readFileSettings(); diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 70977aaa..76a89d3f 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -61,8 +61,8 @@ KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) scroll->addChild(_table); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); } void KBCharSelect::emitChar() diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3f9df538..85daae34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -74,7 +74,7 @@ KBabelHighlighter::KBabelHighlighter( TQTextEdit * edit, KSpell *spell ) : TQObj readSettings( ); regexps << accelMarker + "[\\w]"; - connect( _edit, TQT_SIGNAL( textChanged( ) ), this, TQT_SLOT( highlight( ) ) ); + connect( _edit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( highlight( ) ) ); setSpellChecker(spell); } @@ -285,8 +285,8 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) { if( mSpell ) { - disconnect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + disconnect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // cleanup the cache dict.clear(); @@ -296,11 +296,11 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) if( mSpell ) { - connect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + connect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // wait for KSpell to startup correctly - kapp->processEvents(500); + tdeApp->processEvents(500); } highlight(); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index a6282e83..37132825 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -46,7 +46,7 @@ #include <kcursor.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include <tqfile.h> @@ -87,7 +87,7 @@ private: }; -class KBabelApp : public KUniqueApplication +class KBabelApp : public TDEUniqueApplication { public: KBabelApp(); @@ -100,7 +100,7 @@ private: }; KBabelApp::KBabelApp() - : KUniqueApplication() + : TDEUniqueApplication() { kbInterface = new KBabelInterface; } @@ -126,7 +126,7 @@ int KBabelApp::newInstance() #endif { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -162,7 +162,7 @@ int KBabelApp::newInstance() TQString m = TQString::fromLocal8Bit(msgid); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); kbInterface->gotoFileEntry(args->url(0).url().local8Bit(),m.utf8()); } else @@ -191,7 +191,7 @@ int KBabelApp::newInstance() } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } @@ -237,7 +237,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KURL u(TQString::fromLocal8Bit(url)); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) @@ -259,7 +259,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -277,7 +277,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u,TQString::fromUtf8(package),false); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return; } @@ -293,7 +293,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -310,7 +310,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilename, TQCString package, int newWindow) @@ -326,7 +326,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam const KURL t( TQString::fromLocal8Bit( openFilename ) ); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) @@ -356,7 +356,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::gotoFileEntry(TQCString url, TQCString m) @@ -496,7 +496,7 @@ void KBabelInterface::spellcheck(TQStringList fileList) KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& project, const TQString& package) const { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = 0; if( !url.isEmpty() ) @@ -527,7 +527,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return kb; } @@ -593,10 +593,10 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if(!KUniqueApplication::start()) + if(!TDEUniqueApplication::start()) { return 0; } diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 3d614f68..80bc4c90 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -77,7 +77,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) setWordWrap( WidgetWidth ); viewport()->setAcceptDrops( false ); // we need our parent to get drops - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT( onSelectionChanged() ) ); } void MyMultiLineEdit::onSelectionChanged() @@ -641,11 +641,11 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const // this will setup bitBlt pixmaps setFont( font() ); highlighter = new KBabelHighlighter( this, spell ); - connect( this, TQT_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQT_SLOT( setSyntaxHighlighting( bool ) ) ); + connect( this, TQ_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQ_SLOT( setSyntaxHighlighting( bool ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( paintSpacePoints() ) ); - connect( this, TQT_SIGNAL( cursorPositionChanged( int, int ) ), this, TQT_SLOT( paintSpacePoints(int, int) ) ); - connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( emittedTextChanged() ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( paintSpacePoints() ) ); + connect( this, TQ_SIGNAL( cursorPositionChanged( int, int ) ), this, TQ_SLOT( paintSpacePoints(int, int) ) ); + connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( emittedTextChanged() ) ); } MsgMultiLineEdit::~MsgMultiLineEdit () diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 1c27d264..2fac95af 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -155,7 +155,7 @@ protected: bool _dontUpdate; protected slots: - virtual void insert ( const TQString & text, bool indent = FALSE, bool checkNewLine = TRUE, bool removeSelected = TRUE ); + virtual void insert ( const TQString & text, bool indent = false, bool checkNewLine = true, bool removeSelected = true ); virtual void emitCursorPosition(); signals: diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 58013eac..6f7de0a1 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -54,7 +54,7 @@ SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project _contextView = new SourceContext (this, project); layout->addWidget (_contextView); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void SourceView::updateView() diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 3233ab57..326a0bc7 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -54,13 +54,13 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje layout->addWidget (_tagBox); - connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) - , this, TQT_SIGNAL(signalTagSelected(const TQString&))); - connect(_tagBox,TQT_SIGNAL(highlighted(int)) - , this, TQT_SIGNAL(signalHighlightedTagChanged(int))); + connect(_tagBox,TQ_SIGNAL(selected(const TQString&)) + , this, TQ_SIGNAL(signalTagSelected(const TQString&))); + connect(_tagBox,TQ_SIGNAL(highlighted(int)) + , this, TQ_SIGNAL(signalHighlightedTagChanged(int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)) - , this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)) + , this, TQ_SLOT(setDisabled(bool))); } void TagListView::updateView() |