diff options
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r-- | kbabel/kbabel/commentview.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.cpp | 230 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.cpp | 18 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview2.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbhighlighting.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/mymultilineedit.cpp | 2 |
6 files changed, 128 insertions, 128 deletions
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 7126f422..324c4d32 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -210,7 +210,7 @@ const TQString CommentView::selectedText () void CommentView::installEventFilter( const TQObject * filterObj ) { - commentEdit->installEventFilter( filterObj ); + commentEdit->installEventFilter( const_cast<TQObject*>(filterObj) ); } bool CommentView::hasFocus() diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 73f4d365..d3aafed8 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -217,18 +217,18 @@ void KBabelMW::init(KBCatalog* catalog) 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()),this,TQT_SLOT(clearProgressBar())); + connect(catalog,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,this,TQT_SLOT(prepareProgressBar(TQString,int))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(enableDefaults(bool))); + ,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)),this,TQT_SLOT(showModified(bool))); + connect(catalog,TQT_SIGNAL(signalModified(bool)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool))); // allow the view to change the statusbar and caption connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); + TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&))); connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(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 @@ -263,15 +263,15 @@ void KBabelMW::init(KBCatalog* catalog) ,TQT_SLOT(setLedColor(const TQColor&))); - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_SLOT(enableStop(bool))); + 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()),this,TQT_SLOT(clearProgressBar())); + connect(m_view,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,this,TQT_SLOT(prepareProgressBar(TQString,int))); + ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int))); connect(m_view,TQT_SIGNAL(signalDictionariesChanged()) - , this, TQT_SLOT(buildDictMenus())); + , TQT_TQOBJECT(this), TQT_SLOT(buildDictMenus())); connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this , TQT_SLOT(updateCursorPosition(int,int))); @@ -301,7 +301,7 @@ void KBabelMW::init(KBCatalog* catalog) bmHandler, TQT_SLOT(slotClearBookmarks())); } connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)), - this, TQT_SLOT(slotOpenBookmark(int))); + TQT_TQOBJECT(this), TQT_SLOT(slotOpenBookmark(int))); connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)), bmHandler, TQT_SLOT(slotClearBookmarks())); @@ -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.").tqarg(encodingStr)); - TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure())); + TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure())); } _config->writeEntry("Version",VERSION); @@ -404,68 +404,68 @@ void KBabelMW::setupActions() KAction* action; // the file menu - action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - a_recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), actionCollection()); + a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection()); a_recent->setMaxItems(MAX_RECENT); - action = KStdAction::revert(m_view,TQT_SLOT(revertToSaved()),actionCollection()); - action=KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - action = new KAction(i18n("Save Sp&ecial..."), 0, this, TQT_SLOT(fileSaveSpecial()), + 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 KAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new KAction(i18n("Set &Package..."), 0, m_view, TQT_SLOT(setFilePackage()), + action = new KAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), actionCollection(), "set_package" ); - action = KStdAction::mail(this, TQT_SLOT(fileMail()), actionCollection()); + action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection()); - action = new KAction(i18n("&New View"), 0, this, TQT_SLOT(fileNewView()), + action = new KAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new KAction(i18n("New &Window"), 0, this, TQT_SLOT(fileNewWindow()), + action = new KAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); action->setShortcut( KStdAccel::openNew() ); - action = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); + action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); // the edit menu - action = KStdAction::undo(m_view, TQT_SLOT(undo()), actionCollection()); - action = KStdAction::redo(m_view, TQT_SLOT(redo()), actionCollection()); - action = KStdAction::cut(m_view, TQT_SIGNAL(signalCut()), actionCollection()); - action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection()); - action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection()); - action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::tqfind(m_view, TQT_SLOT(tqfind()), actionCollection()); - action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection()); - action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::tqreplace(m_view, TQT_SLOT(tqreplace()), actionCollection()); - - action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" ); - - action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view + 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(tqfind()), 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(tqreplace()), actionCollection()); + + action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" ); + + action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view) ,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); action = new KAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", - CTRL+ALT+Key_Space, m_view, TQT_SLOT(search2msgstr()), + CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()), actionCollection(), "search2msgstr"); - action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view + action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view) ,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); - action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview + action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview) ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, m_view + a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view) , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy"); - action = new KAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()), + action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), actionCollection(), "edit_edit_header"); action = new KAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N - , m_view, TQT_SLOT(insertNextTag()) + , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag()) , actionCollection(),"insert_next_tag"); connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); action = new KAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M - , m_view, TQT_SLOT(insertNextTagMsgid()) + , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); @@ -477,22 +477,22 @@ void KBabelMW::setupActions() connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag())); action = new KAction(i18n("Show Tags Menu"),CTRL+Key_Less - , m_view, TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); + , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); action->setEnabled(false); connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); action = new KAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M - , m_view, TQT_SLOT(skipToNextTag()) + , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag()) , actionCollection(),"move_to_next_tag"); action = new KAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B - , m_view, TQT_SLOT(skipToPreviousTag()) + , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag()) , actionCollection(),"move_to_prev_tag"); action = new KAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G - , m_view, TQT_SLOT(insertNextArg()) + , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); @@ -504,7 +504,7 @@ void KBabelMW::setupActions() connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg())); action = new KAction(i18n("Show Arguments Menu"),CTRL+Key_Percent - , m_view, TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); + , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action @@ -512,181 +512,181 @@ void KBabelMW::setupActions() // next, the go-menu action = new KAction(i18n("&Previous"), "previous", - KStdAccel::shortcut(KStdAccel::Prior), m_view , TQT_SLOT(gotoPrev()), + KStdAccel::shortcut(KStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); action = new KAction(i18n("&Next"), "next", - KStdAccel::shortcut(KStdAccel::Next), m_view , TQT_SLOT(gotoNext()), + KStdAccel::shortcut(KStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), actionCollection(),"go_next_entry"); - action = KStdAction::goTo(m_view, TQT_SLOT(gotoEntry()), actionCollection()); + action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection()); action->setShortcut( KStdAccel::gotoLine()); - action = KStdAction::firstPage(m_view, TQT_SLOT(gotoFirst()),actionCollection()); + action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection()); action->setText(i18n("&First Entry")); action->setShortcut(CTRL+ALT+Key_Home); - action = KStdAction::lastPage(m_view, TQT_SLOT(gotoLast()),actionCollection()); + action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection()); action->setText(i18n("&Last Entry")); action->setShortcut(CTRL+ALT+Key_End); a_prevFoU = new KAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans", - CTRL+SHIFT+Key_Prior, m_view, + CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); a_nextFoU = new KAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", - CTRL+SHIFT+Key_Next, m_view, + CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); a_prevFuzzy = new KAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", - CTRL+Key_Prior, m_view, + CTRL+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); a_nextFuzzy = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", - CTRL+Key_Next, m_view, + CTRL+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); a_prevUntrans = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", - ALT+Key_Prior, m_view, + ALT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); a_nextUntrans = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", - ALT+Key_Next, m_view, + ALT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action = new KAction(i18n("Previo&us Error"), "preverror", - SHIFT+Key_Prior, m_view, + SHIFT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); action = new KAction(i18n("Next Err&or"), "nexterror", - SHIFT+Key_Next, m_view, + SHIFT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); - action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view, + action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view), TQT_SLOT(backHistory()),actionCollection(), "go_back_history"); - action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view, + action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view), TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); // the search menu actionMenu=new KActionMenu(i18n("&Find Text"), "transsearch",actionCollection(),"dict_search_all"); connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch())); - dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(dictMenu,TQT_SIGNAL(activated(const TQString)), m_view + 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))); actionMenu=new KActionMenu(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(),this); - connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), m_view + 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))); actionMenu=new KActionMenu(i18n("&Edit Dictionary"), "transsearch",actionCollection(),"dict_edit"); - editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), m_view + 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))); actionMenu=new KActionMenu(i18n("Con&figure Dictionary"), "transsearch",actionCollection(),"dict_configure"); - configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), m_view + 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))); actionMenu=new KActionMenu(i18n("About Dictionary"), "transsearch", actionCollection(), "dict_about"); - aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); - connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), m_view + 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))); buildDictMenus(); // the project menu action = new KAction(i18n("&New..."), "filenew" - , this, TQT_SLOT(projectNew()),actionCollection() + , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() ,"project_new"); action = new KAction(i18n("&Open..."), "fileopen" - , this, TQT_SLOT(projectOpen()),actionCollection() + , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() ,"project_open"); action = new KAction(i18n("C&lose"), "fileclose" - , this, TQT_SLOT(projectClose()),actionCollection() + , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); action = new KAction(i18n("&Configure..."), "configure" - , this, TQT_SLOT(projectConfigure()),actionCollection() + , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() ,"project_settings"); - a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, this, TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); // the tools menu action = new KAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I - , m_view, TQT_SLOT(spellcheckCommon()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); action = new KAction(i18n("&Check All..."), "spellcheck_all", 0 - , m_view, TQT_SLOT(spellcheckAll()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); action = new KAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 - , m_view, TQT_SLOT(spellcheckFromCursor()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); action = new KAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 - , m_view, TQT_SLOT(spellcheckCurrent()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); action = new KAction(i18n("Check Fro&m Current to End of File..."), 0 - , m_view, TQT_SLOT(spellcheckFromCurrent()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); action = new KAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 - , m_view, TQT_SLOT(spellcheckMarked()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); KToggleAction *toggleAction; toggleAction = new KToggleAction(i18n("&Diffmode"), "autodiff", 0 ,actionCollection(), "diff_toggleDiff"); - connect(toggleAction,TQT_SIGNAL(toggled(bool)), m_view, TQT_SLOT(toggleAutoDiff(bool))); + 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))); toggleAction->setChecked(m_view->autoDiffEnabled()); action = new KAction(i18n("&Show Diff"), "diff", Key_F5 - , m_view, TQT_SLOT(diff()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection() ,"diff_diff"); action = new KAction(i18n("S&how Original Text"), "contents", Key_F6 - , m_view, TQT_SLOT(diffShowOrig()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); action = new KAction(i18n("&Open File for Diff"), "fileopen" ,0 - , m_view, TQT_SLOT(openDiffFile()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); action = new KAction(i18n("&Rough Translation..."), 0 - , m_view, TQT_SLOT(roughTranslation()),actionCollection() + , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); - action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this, + action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); + new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new KAction( i18n("&Word Count"), 0, m_view, TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new KAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); - KStdAction::configureToolbars(this,TQT_SLOT(optionsEditToolbars()),actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection()); KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection()); - KStdAction::preferences(this,TQT_SLOT(optionsPreferences()),actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection()); setStandardToolBarMenuEnabled ( true ); - action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, m_view, + action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view), TQT_SLOT(stopSearch()),actionCollection(), "stop_search"); action->setEnabled(false); - new KAction(i18n("&Gettext Info"), 0, this, + new KAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); // the bookmarks menu - action = KStdAction::addBookmark(this, TQT_SLOT(slotAddBookmark()), + action = KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_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 KAction(i18n("Clear Bookmarks"), 0, this, TQT_SLOT(dummySlot()), + new KAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -759,19 +759,19 @@ void KBabelMW::setupDynamicActions() TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); TQPtrList<KAction> actions = ToolAction::dataToolActionList( - tools, m_view, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), + tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), "validate", false, actionCollection() ); KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); - KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view, + KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), TQT_SLOT(checkAll()),actionCollection(), "check_all"); ac->setEnabled(false); m_menu->insert(ac); m_menu->insert( new KActionSeparator() ); - ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view, + ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), TQT_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, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, TQT_TQOBJECT(m_view), TQT_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, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, TQT_TQOBJECT(m_view), TQT_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, m_view, TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, TQT_TQOBJECT(m_view), TQT_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)),this,TQT_SLOT(quit())); + connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_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, this, TQT_SLOT( close() )); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT( close() )); return false; } @@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url) void KBabelMW::fileSave() { // do it asynchronously due to kdelibs bug - TQTimer::singleShot( 0, this, TQT_SLOT( fileSave_internal() )); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() )); } void KBabelMW::fileSave_internal() @@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars() { saveMainWindowSettings( KGlobal::config(), "View" ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig())); dlg.exec(); } @@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) } if(p) - kb = static_cast<KBabelMW*>(p); + kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p)); } return kb; @@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project) } if(p) - kb = static_cast<KBabelMW*>(p); + kb = static_cast<KBabelMW*>(TQT_TQWIDGET(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) ), this, TQT_SLOT( spellcheckDone(int))); + connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(this), TQT_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)), this, TQT_SLOT(spellcheckDone( int))); + disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), TQT_TQOBJECT(this), TQT_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, m_view, TQT_SLOT(spellcheckAllMulti())); + TQTimer::singleShot( 1, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti())); } } @@ -1793,7 +1793,7 @@ void KBabelMW::projectConfigure() { _projectDialog = new ProjectDialog(_project); connect (_projectDialog, TQT_SIGNAL (settingsChanged()) - , m_view, TQT_SLOT (updateProjectSettings())); + , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings())); } int prefHeight=_projectDialog->height(); diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 0e685f0c..9d7f4df2 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -376,7 +376,7 @@ of the currently displayed entry.</p></qt>")); 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( this ); + m_commentview->installEventFilter( TQT_TQOBJECT(this) ); // build the msgstr widget tempWidget=new TQWidget(this,"msgstrWidget"); @@ -770,7 +770,7 @@ void KBabelView::readProject(Project::Ptr project) spell2.config->setEncoding(_spellcheckSettings.spellEncoding); spell2.config->setDictionary(_spellcheckSettings.spellDict); - spell2.kspell= new KSpell(this, "", this, TQT_SLOT(dummy(KSpell *)), + spell2.kspell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)), spell2.config, false, false); if(spell2.kspell->status() == KSpell::Error) kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl; @@ -2615,7 +2615,7 @@ void KBabelView::replaceAll() while(success) { - kapp->processEvents(100); + kapp->tqprocessEvents(100); _replacesTotal++; @@ -3888,7 +3888,7 @@ void KBabelView::spellcheck() if(emitProgress) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + kapp->tqprocessEvents(100); } uint total=last-first+1; @@ -3900,7 +3900,7 @@ void KBabelView::spellcheck() lastPercent++; emit signalProgress(lastPercent); - kapp->processEvents(100); + kapp->tqprocessEvents(100); } TQStringList msgs=_catalog->msgstr(i); @@ -3943,7 +3943,7 @@ void KBabelView::spellcheck() _dontBeep=true; spell.kspell= new KSpell (this, i18n("Spellcheck"), - this, TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); + TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); if( spell.kspell->status() == KSpell::Error ) { KMessageBox::error( this, i18n("KBabel cannot start spell checker. " @@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *) if(spell.ignoreList.count() > 0) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + kapp->tqprocessEvents(100); uint total = spell.ignoreList.count(); uint oldPercent=0; @@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *) { oldPercent++; emit signalProgress(oldPercent); - kapp->processEvents(100); + kapp->tqprocessEvents(100); } spell.kspell->ignore(*it); @@ -4379,7 +4379,7 @@ void KBabelView::spellCleanDone() // if the pointer is cleared, you have finished correcly if( !spell.kspell ) return; - KSpell::spelltqStatus status = spell.kspell->status(); + KSpell::spellStatus status = spell.kspell->status(); if(status == KSpell::Error || status == KSpell::Crashed) { diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 7b700390..daf0819e 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -940,7 +940,7 @@ bool KBabelView::validateUsingTool( const KDataToolInfo & info, const TQString & bool result=_catalog->checkUsingTool(tool); emitEntryState(); - TQString checkName = *(info.userCommands().at( info.commands().findIndex(command) )); + TQString checkName = *(info.userCommands().at( info.commands().tqfindIndex(command) )); if(result) { diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index f4109a34..05aada8f 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // wait for KSpell to startup correctly - kapp->processEvents(500); + kapp->tqprocessEvents(500); } highlight(); diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 29a8da78..af58cd0a 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints() int i = s.tqfind( " " ); while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN { - TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws; + TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws; TQRect r = mapToView( curpara, i ); r.moveBy( r.width()/2, (r.height() - fm.descent())/2 ); r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 ); |