diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
commit | 7716a5e605907a009e19f429cec4e6b5f346bd71 (patch) | |
tree | 16cf4a5d7a24db774f988022d514adefc75015c0 /kbabel/kbabel | |
parent | 0117fbed932653a04aeef16b2ed7edee858959ac (diff) | |
download | tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.tar.gz tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r-- | kbabel/kbabel/fontpreferences.ui | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.cpp | 178 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.h | 22 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.cpp | 4 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.h | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbcataloglistview.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbcataloglistview.h | 4 | ||||
-rw-r--r-- | kbabel/kbabel/kbcataloglistviewitem.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbcataloglistviewitem.h | 6 | ||||
-rw-r--r-- | kbabel/kbabel/main.cpp | 20 | ||||
-rw-r--r-- | kbabel/kbabel/taglistview.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/taglistview.h | 4 |
12 files changed, 124 insertions, 124 deletions
diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 22b49455..4befa080 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -36,7 +36,7 @@ <string>&Show only fixed font</string> </property> </widget> - <widget class="KFontChooser"> + <widget class="TDEFontChooser"> <property name="name"> <cstring>kcfg_MsgFont</cstring> </property> diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 262e47ab..eea5f60b 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -293,8 +293,8 @@ void KBabelMW::init(KBCatalog* catalog) mailer = new KBabelMailer( this, _project ); bmHandler = new KBabelBookmarkHandler((TQPopupMenu*)factory()->container("bookmark", this)); - // the earlier created KAction for "clear_bookmarks" is now reconnected - KAction* action = actionCollection()->action("clear_bookmarks"); + // 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()), @@ -401,7 +401,7 @@ void KBabelMW::updateSettings() void KBabelMW::setupActions() { - KAction* action; + TDEAction* action; // the file menu action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); @@ -412,19 +412,19 @@ void KBabelMW::setupActions() 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()), + action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new KAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), + action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), actionCollection(), "set_package" ); action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection()); - action = new KAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), + action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new KAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), + action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); - action->setShortcut( KStdAccel::openNew() ); + action->setShortcut( TDEStdAccel::openNew() ); action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); @@ -444,66 +444,66 @@ void KBabelMW::setupActions() 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) + action = new TDEAction(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", + action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "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, TQT_TQOBJECT(m_view) + action = new TDEAction(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, TQT_TQOBJECT(m_charselectorview) + action = new TDEAction(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 Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view) + 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 KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), + action = new TDEAction(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 + action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N , 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 + action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - KActionMenu *actionMenu= new KActionMenu(i18n("Inser&t Tag"), "insert_tag" + 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())); - action = new KAction(i18n("Show Tags Menu"),CTRL+Key_Less + action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less , 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 + action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M , 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 + action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B , 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 + action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - actionMenu= new KActionMenu(i18n("Inser&t Argument"), "insert_arg" + 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())); - action = new KAction(i18n("Show Arguments Menu"),CTRL+Key_Percent + action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); @@ -511,78 +511,78 @@ void KBabelMW::setupActions() ,TQT_SLOT(setEnabled(bool))); // next, the go-menu - action = new KAction(i18n("&Previous"), "previous", - KStdAccel::shortcut(KStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), + action = new TDEAction(i18n("&Previous"), "previous", + TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); - action = new KAction(i18n("&Next"), "next", - KStdAccel::shortcut(KStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), + action = new TDEAction(i18n("&Next"), "next", + TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), actionCollection(),"go_next_entry"); action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection()); - action->setShortcut( KStdAccel::gotoLine()); + action->setShortcut( TDEStdAccel::gotoLine()); 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(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", + 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"); - a_nextFoU = new KAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", + 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"); - a_prevFuzzy = new KAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", + a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", CTRL+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); - a_nextFuzzy = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", + a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); - a_prevUntrans = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", + a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); - a_nextUntrans = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", + a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); - action = new KAction(i18n("Previo&us Error"), "preverror", + action = new TDEAction(i18n("Previo&us Error"), "preverror", SHIFT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); - action = new KAction(i18n("Next Err&or"), "nexterror", + action = new TDEAction(i18n("Next Err&or"), "nexterror", 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, TQT_TQOBJECT(m_view), + action = new TDEAction(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, TQT_TQOBJECT(m_view), + action = new TDEAction(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"), + 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))); - actionMenu=new KActionMenu(i18n("F&ind Selected Text"), + 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))); - actionMenu=new KActionMenu(i18n("&Edit Dictionary"), + 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))); - actionMenu=new KActionMenu(i18n("Con&figure Dictionary"), + 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))); - actionMenu=new KActionMenu(i18n("About Dictionary"), "transsearch", + 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) @@ -591,75 +591,75 @@ void KBabelMW::setupActions() buildDictMenus(); // the project menu - action = new KAction(i18n("&New..."), "filenew" + action = new TDEAction(i18n("&New..."), "filenew" , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() ,"project_new"); - action = new KAction(i18n("&Open..."), "fileopen" + action = new TDEAction(i18n("&Open..."), "fileopen" , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() ,"project_open"); - action = new KAction(i18n("C&lose"), "fileclose" + action = new TDEAction(i18n("C&lose"), "fileclose" , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); - action = new KAction(i18n("&Configure..."), "configure" + action = new TDEAction(i18n("&Configure..."), "configure" , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() ,"project_settings"); - a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new TDERecentFilesAction(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 + action = new TDEAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); - action = new KAction(i18n("&Check All..."), "spellcheck_all", 0 + action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); - action = new KAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 + action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); - action = new KAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 + action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); - action = new KAction(i18n("Check Fro&m Current to End of File..."), 0 + action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); - action = new KAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 + action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); - KToggleAction *toggleAction; + TDEToggleAction *toggleAction; - toggleAction = new KToggleAction(i18n("&Diffmode"), "autodiff", 0 + 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))); toggleAction->setChecked(m_view->autoDiffEnabled()); - action = new KAction(i18n("&Show Diff"), "diff", Key_F5 + action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5 , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection() ,"diff_diff"); - action = new KAction(i18n("S&how Original Text"), "contents", Key_F6 + action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6 , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); - action = new KAction(i18n("&Open File for Diff"), "fileopen" ,0 + action = new TDEAction(i18n("&Open File for Diff"), "fileopen" ,0 , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); - action = new KAction(i18n("&Rough Translation..."), 0 + action = new TDEAction(i18n("&Rough Translation..."), 0 , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); - action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), + action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new KAction( 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,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new KAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); @@ -671,11 +671,11 @@ void KBabelMW::setupActions() setStandardToolBarMenuEnabled ( true ); - action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view), + action = new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); @@ -686,7 +686,7 @@ void KBabelMW::setupActions() 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, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), + new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -758,20 +758,20 @@ void KBabelMW::setupDynamicActions() // dynamic validation tools TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); - TQPtrList<KAction> actions = ToolAction::dataToolActionList( + TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( 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"); + TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); - KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), + TDEAction* ac = new TDEAction(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() ); + m_menu->insert( new TDEActionSeparator() ); - ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), + ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax"); ac->setEnabled(false); m_menu->insert(ac); @@ -811,7 +811,7 @@ void KBabelMW::setupDynamicActions() } // insert tools - m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); + m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); for( ac = actions.first(); ac ; ac = actions.next() ) { m_menu->insert(ac); @@ -848,7 +848,7 @@ void KBabelMW::setupDynamicActions() "validate", true, actionCollection() ); // insert tools - m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); + m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); for( ac = actions.first(); ac ; ac = actions.next() ) { m_menu->insert(ac); @@ -1083,7 +1083,7 @@ void KBabelMW::fileSave_internal() else { // disable save - KAction* saveAction=(KAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) ); + TDEAction* saveAction=(TDEAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) ); saveAction->setEnabled(false); m_view->saveFile(); @@ -1263,7 +1263,7 @@ void KBabelMW::openCatalogManager() TQString url = ""; if( kapp->startServiceByDesktopName(prog,url, &result,&service)) { - KMessageBox::error(this, i18n("Unable to use KLauncher to start " + KMessageBox::error(this, i18n("Unable to use TDELauncher to start " "Catalog Manager. You should check the installation of TDE.\n" "Please start Catalog Manager manually.")); return; @@ -1281,8 +1281,8 @@ void KBabelMW::openCatalogManager() void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm) { - KAction* firstAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage)); - KAction* prevAction=(KAction*)actionCollection()->action("go_prev_entry"); + TDEAction* firstAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage)); + TDEAction* prevAction=(TDEAction*)actionCollection()->action("go_prev_entry"); firstAction->setEnabled(!firstEntry); prevAction->setEnabled(!(firstEntry && firstForm)); @@ -1291,8 +1291,8 @@ void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm) void KBabelMW::lastEntryDisplayed(bool lastEntry, bool lastForm) { - KAction* lastAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage)); - KAction* nextAction=(KAction*)actionCollection()->action("go_next_entry"); + TDEAction* lastAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage)); + TDEAction* nextAction=(TDEAction*)actionCollection()->action("go_next_entry"); lastAction->setEnabled(!lastEntry); nextAction->setEnabled(!(lastEntry && lastForm)); @@ -1323,7 +1323,7 @@ void KBabelMW::untranslatedDisplayed(bool flag) return; // do not allow fuzzy toggle for untranslated - KAction *action=actionCollection()->action("edit_toggle_fuzzy"); + TDEAction *action=actionCollection()->action("edit_toggle_fuzzy"); if(action) action->setEnabled(!flag); @@ -1445,26 +1445,26 @@ void KBabelMW::hasUntranslatedInFront(bool flag) void KBabelMW::hasErrorAfterwards(bool flag) { - KAction* action=actionCollection()->action("go_next_error"); + TDEAction* action=actionCollection()->action("go_next_error"); action->setEnabled(flag); } void KBabelMW::hasErrorInFront(bool flag) { - KAction* action=actionCollection()->action("go_prev_error"); + TDEAction* action=actionCollection()->action("go_prev_error"); action->setEnabled(flag); } void KBabelMW::enableBackHistory(bool on) { - KAction* action=actionCollection()->action("go_back_history"); + TDEAction* action=actionCollection()->action("go_back_history"); action->setEnabled(on); } void KBabelMW::enableForwardHistory(bool on) { - KAction* action=actionCollection()->action("go_forward_history"); + TDEAction* action=actionCollection()->action("go_forward_history"); action->setEnabled(on); } @@ -1519,7 +1519,7 @@ void KBabelMW::showModified(bool on) // display the text on the caption setCaption(m_view->catalog()->package(),on); - KAction *action=actionCollection()->action( + TDEAction *action=actionCollection()->action( KStdAction::stdName(KStdAction::Save)); action->setEnabled(on); @@ -1541,19 +1541,19 @@ void KBabelMW::enableDefaults(bool readOnly) void KBabelMW::enableUndo(bool on) { - KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); action->setEnabled(on); } void KBabelMW::enableRedo(bool on) { - KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); action->setEnabled(on); } void KBabelMW::enableStop(bool flag) { - KAction* action=(KAction*)actionCollection()->action("stop_search"); + TDEAction* action=(TDEAction*)actionCollection()->action("stop_search"); action->setEnabled(flag); } @@ -1771,7 +1771,7 @@ void KBabelMW::changeProjectActions(const TQString& project) { bool def = (project == KBabel::ProjectManager::defaultProjectName()); - KAction* saveAction=(KAction*)actionCollection()->action( "project_close" ); + TDEAction* saveAction=(TDEAction*)actionCollection()->action( "project_close" ); saveAction->setEnabled( ! def ); if (!def) diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 7e6b4913..9d6b6bd4 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -49,8 +49,8 @@ #include "kbabelview.h" #include "kbproject.h" -class KAction; -class KRecentFilesAction; +class TDEAction; +class TDERecentFilesAction; class KLed; class KProgress; class TQHBox; @@ -293,16 +293,16 @@ private: // frequently used actions - KAction* a_unsetFuzzy; - KAction* a_prevFoU; - KAction* a_nextFoU; - KAction* a_prevFuzzy; - KAction* a_nextFuzzy; - KAction* a_prevUntrans; - KAction* a_nextUntrans; + TDEAction* a_unsetFuzzy; + TDEAction* a_prevFoU; + TDEAction* a_nextFoU; + TDEAction* a_prevFuzzy; + TDEAction* a_nextFuzzy; + TDEAction* a_prevUntrans; + TDEAction* a_nextUntrans; - KRecentFilesAction* a_recent; - KRecentFilesAction* a_recentprojects; + TDERecentFilesAction* a_recent; + TDERecentFilesAction* a_recentprojects; DictionaryMenu *dictMenu; DictionaryMenu *selectionDictMenu; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 8cf98335..5755a3e3 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -3460,12 +3460,12 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event) gotoLast(); return true; } - else if( KShortcut(KKey(ke)) == KStdAccel::undo() ) + else if( TDEShortcut(KKey(ke)) == TDEStdAccel::undo() ) { undo(); return true; } - else if( KShortcut(KKey(ke)) == KStdAccel::redo() ) + else if( TDEShortcut(KKey(ke)) == TDEStdAccel::redo() ) { redo(); return true; diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index 28766458..b9b286ea 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -54,7 +54,7 @@ namespace KBabel class TQListBoxItem; class TQTextView; class TQTabWidget; -class KListBox; +class TDEListBox; class KSpell; class KSpellConfig; class KBabelDictBox; diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index aace2c10..d05f135c 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -40,7 +40,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_catalog= catalog; TQVBoxLayout* layout=new TQVBoxLayout(this); - m_listview = new KListView(this, "catalogListView"); + m_listview = new TDEListView(this, "catalogListView"); m_listview->addColumn(i18n("Id")); m_listview->addColumn(i18n("Original String")); m_listview->addColumn(i18n("Translated String")); diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h index c1fcd005..92f08603 100644 --- a/kbabel/kbabel/kbcataloglistview.h +++ b/kbabel/kbabel/kbcataloglistview.h @@ -41,7 +41,7 @@ namespace KBabel{ class KBabelMW; class KBCatalog; -class KListView; +class TDEListView; /** @@ -72,7 +72,7 @@ public slots: void msgstrChanged(const TQString&); private: - KListView * m_listview; + TDEListView * m_listview; KBCatalog* m_catalog; TQPtrVector<KBCatalogListViewItem>* m_items; diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 4bbc3049..92eb158b 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -23,7 +23,7 @@ #include "kbcataloglistviewitem.h" #include <assert.h> -KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr) +KBCatalogListViewItem::KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr) : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) { setText(0,TQString::number(id)); diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 4a24c159..89c0e859 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -30,11 +30,11 @@ /** @author */ -class KBCatalogListViewItem : public KListViewItem +class KBCatalogListViewItem : public TDEListViewItem { - typedef KListViewItem Super; + typedef TDEListViewItem Super; public: - KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr); + KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr); ~KBCatalogListViewItem(); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 1ecea9ed..2ed2cba1 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -246,9 +246,9 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int } else { - KMainWindow *mw = 0; - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + TDEMainWindow *mw = 0; + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); // first, try to lookup correct winid while( mw ) { @@ -263,7 +263,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return ; } - mw = KMainWindow::memberList->next(); + mw = TDEMainWindow::memberList->next(); } // now, the empty window @@ -282,8 +282,8 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return; } - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); while( mw ) { if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) @@ -297,7 +297,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return ; } - mw = KMainWindow::memberList->next(); + mw = TDEMainWindow::memberList->next(); } if( !mw ) @@ -335,9 +335,9 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam } else { - KMainWindow *mw = 0; - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + TDEMainWindow *mw = 0; + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 11d0905e..0fdd8183 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -50,7 +50,7 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); - _tagBox = new KListBox (this, "taglist textview"); + _tagBox = new TDEListBox (this, "taglist textview"); layout->addWidget (_tagBox); diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h index d8c8dd11..c936435d 100644 --- a/kbabel/kbabel/taglistview.h +++ b/kbabel/kbabel/taglistview.h @@ -35,7 +35,7 @@ #include "kbcatalogview.h" -class KListBox; +class TDEListBox; class TagListView : public KBCatalogView { @@ -56,7 +56,7 @@ signals: void signalTagSelected (const TQString& tag); private: - KListBox* _tagBox; + TDEListBox* _tagBox; }; #endif // TAGLISTVIEW_H |