From 8d9b90ca794ffabf151719c2edebe9278a2d3f36 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:15:24 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/mainwindow.cpp | 264 ++++++++++++++++++++++++++--------------------------- 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 377d9d2..ec79e7c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -87,7 +87,7 @@ // the null string and bool are dummy arguments #define MIME_ICON(s) \ - KMimeType::mimeType(TQString::tqfromLatin1(s))->icon(TQString(), false) + KMimeType::mimeType(TQString::fromLatin1(s))->icon(TQString(), false) namespace { static const int MAIN_WINDOW_MIN_WIDTH = 600; @@ -126,7 +126,7 @@ MainWindow::MainWindow(TQWidget* parent_/*=0*/, const char* name_/*=0*/) : KMain // has to be after controller init Kernel::init(this); // the only time this is ever called! - setIcon(DesktopIcon(TQString::tqfromLatin1("tellico"))); + setIcon(DesktopIcon(TQString::fromLatin1("tellico"))); // initialize the status bar and progress bar initStatusBar(); @@ -187,14 +187,14 @@ void MainWindow::initActions() { KActionMenu* fileNewMenu = new KActionMenu(actionCollection(), "file_new_collection"); fileNewMenu->setText(i18n("New")); -// fileNewMenu->setIconSet(BarIconSet(TQString::tqfromLatin1("filenew"))); // doesn't work - fileNewMenu->setIconSet(BarIcon(TQString::tqfromLatin1("filenew"))); +// fileNewMenu->setIconSet(BarIconSet(TQString::fromLatin1("filenew"))); // doesn't work + fileNewMenu->setIconSet(BarIcon(TQString::fromLatin1("filenew"))); fileNewMenu->setToolTip(i18n("Create a new collection")); fileNewMenu->setDelayed(false); KAction* action = new KAction(actionCollection(), "new_book_collection"); action->setText(i18n("New &Book Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("book"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("book"))); action->setToolTip(i18n("Create a new book collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -202,7 +202,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_bibtex_collection"); action->setText(i18n("New B&ibliography")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("bibtex"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex"))); action->setToolTip(i18n("Create a new bibtex bibliography")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -210,7 +210,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_comic_book_collection"); action->setText(i18n("New &Comic Book Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("comic"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("comic"))); action->setToolTip(i18n("Create a new comic book collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -218,7 +218,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_video_collection"); action->setText(i18n("New &Video Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("video"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("video"))); action->setToolTip(i18n("Create a new video collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -226,7 +226,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_music_collection"); action->setText(i18n("New &Music Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("album"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("album"))); action->setToolTip(i18n("Create a new music collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -234,7 +234,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_coin_collection"); action->setText(i18n("New C&oin Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("coin"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("coin"))); action->setToolTip(i18n("Create a new coin collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -242,7 +242,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_stamp_collection"); action->setText(i18n("New &Stamp Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("stamp"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("stamp"))); action->setToolTip(i18n("Create a new stamp collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -250,7 +250,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_card_collection"); action->setText(i18n("New C&ard Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("card"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("card"))); action->setToolTip(i18n("Create a new trading card collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -258,7 +258,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_wine_collection"); action->setText(i18n("New &Wine Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("wine"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("wine"))); action->setToolTip(i18n("Create a new wine collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -266,7 +266,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_game_collection"); action->setText(i18n("New &Game Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("game"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("game"))); action->setToolTip(i18n("Create a new game collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -274,7 +274,7 @@ void MainWindow::initActions() { collectionMapper->setMapping(action, Data::Collection::Game); action = new KAction(actionCollection(), "new_boardgame_collection"); action->setText(i18n("New Boa&rd Game Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("boardgame"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("boardgame"))); action->setToolTip(i18n("Create a new board game collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -282,7 +282,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_file_catalog"); action->setText(i18n("New &File Catalog")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("file"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("file"))); action->setToolTip(i18n("Create a new file catalog")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -290,7 +290,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "new_custom_collection"); action->setText(i18n("New C&ustom Collection")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("filenew"))); + action->setIconSet(UserIconSet(TQString::fromLatin1("filenew"))); action->setToolTip(i18n("Create a new custom collection")); fileNewMenu->insert(action); connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); @@ -320,14 +320,14 @@ void MainWindow::initActions() { KActionMenu* importMenu = new KActionMenu(actionCollection(), "file_import"); importMenu->setText(i18n("&Import")); - importMenu->setIconSet(BarIconSet(TQString::tqfromLatin1("fileimport"))); + importMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileimport"))); importMenu->setToolTip(i18n("Import collection data from other formats")); importMenu->setDelayed(false); action = new KAction(actionCollection(), "file_import_tellico"); action->setText(i18n("Import Tellico Data...")); action->setToolTip(i18n("Import another Tellico data file")); - action->setIcon(TQString::tqfromLatin1("tellico")); + action->setIcon(TQString::fromLatin1("tellico")); importMenu->insert(action); connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); importMapper->setMapping(action, Import::TellicoXML); @@ -351,7 +351,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_import_alexandria"); action->setText(i18n("Import Alexandria Data...")); action->setToolTip(i18n("Import data from the Alexandria book collection manager")); - action->setIcon(TQString::tqfromLatin1("alexandria")); + action->setIcon(TQString::fromLatin1("alexandria")); importMenu->insert(action); connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); importMapper->setMapping(action, Import::Alexandria); @@ -367,7 +367,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_import_referencer"); action->setText(i18n("Import Referencer Data...")); action->setToolTip(i18n("Import data from Referencer")); - action->setIcon(TQString::tqfromLatin1("referencer")); + action->setIcon(TQString::fromLatin1("referencer")); importMenu->insert(action); connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); importMapper->setMapping(action, Import::Referencer); @@ -429,7 +429,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_import_gcfilms"); action->setText(i18n("Import GCstar Data...")); action->setToolTip(i18n("Import a GCstar data file")); - action->setIcon(TQString::tqfromLatin1("gcstar")); + action->setIcon(TQString::fromLatin1("gcstar")); importMenu->insert(action); connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); importMapper->setMapping(action, Import::GCfilms); @@ -437,7 +437,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_import_griffith"); action->setText(i18n("Import Griffith Data...")); action->setToolTip(i18n("Import a Griffith database")); - action->setIcon(TQString::tqfromLatin1("griffith")); + action->setIcon(TQString::fromLatin1("griffith")); importMenu->insert(action); connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); importMapper->setMapping(action, Import::Griffith); @@ -474,14 +474,14 @@ void MainWindow::initActions() { KActionMenu* exportMenu = new KActionMenu(actionCollection(), "file_export"); exportMenu->setText(i18n("&Export")); - exportMenu->setIconSet(BarIconSet(TQString::tqfromLatin1("fileexport"))); + exportMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileexport"))); exportMenu->setToolTip(i18n("Export the collection data to other formats")); exportMenu->setDelayed(false); action = new KAction(actionCollection(), "file_export_xml"); action->setText(i18n("Export to XML...")); action->setToolTip(i18n("Export to a Tellico XML file")); - action->setIcon(TQString::tqfromLatin1("tellico")); + action->setIcon(TQString::fromLatin1("tellico")); exportMenu->insert(action); connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); exportMapper->setMapping(action, Export::TellicoXML); @@ -489,7 +489,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_export_zip"); action->setText(i18n("Export to Zip...")); action->setToolTip(i18n("Export to a Tellico Zip file")); - action->setIcon(TQString::tqfromLatin1("tellico")); + action->setIcon(TQString::fromLatin1("tellico")); exportMenu->insert(action); connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); exportMapper->setMapping(action, Export::TellicoZip); @@ -521,7 +521,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_export_alexandria"); action->setText(i18n("Export to Alexandria...")); action->setToolTip(i18n("Export to an Alexandria library")); - action->setIcon(TQString::tqfromLatin1("alexandria")); + action->setIcon(TQString::fromLatin1("alexandria")); exportMenu->insert(action); connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); exportMapper->setMapping(action, Export::Alexandria); @@ -553,7 +553,7 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "file_export_gcfilms"); action->setText(i18n("Export to GCfilms...")); action->setToolTip(i18n("Export to a GCfilms data file")); - action->setIcon(TQString::tqfromLatin1("gcstar")); + action->setIcon(TQString::fromLatin1("gcstar")); exportMenu->insert(action); connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); exportMapper->setMapping(action, Export::GCfilms); @@ -585,12 +585,12 @@ void MainWindow::initActions() { action = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotEditDeselect()), actionCollection()); action->setToolTip(i18n("Deselect all the entries in the collection")); - action = new KAction(i18n("Internet Search..."), TQString::tqfromLatin1("wizard"), CTRL + Key_M, + action = new KAction(i18n("Internet Search..."), TQString::fromLatin1("wizard"), CTRL + Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowFetchDialog()), actionCollection(), "edit_search_internet"); action->setToolTip(i18n("Search the internet...")); - action = new KAction(i18n("Advanced &Filter..."), TQString::tqfromLatin1("filter"), CTRL + Key_J, + action = new KAction(i18n("Advanced &Filter..."), TQString::fromLatin1("filter"), CTRL + Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilterDialog()), actionCollection(), "filter_dialog"); action->setToolTip(i18n("Filter the collection")); @@ -598,46 +598,46 @@ void MainWindow::initActions() { /************************************************* * Collection menu *************************************************/ - m_newEntry = new KAction(i18n("&New Entry..."), TQString::tqfromLatin1("filenew"), CTRL + Key_N, + m_newEntry = new KAction(i18n("&New Entry..."), TQString::fromLatin1("filenew"), CTRL + Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewEntry()), actionCollection(), "coll_new_entry"); m_newEntry->setToolTip(i18n("Create a new entry")); - m_editEntry = new KAction(i18n("&Edit Entry..."), TQString::tqfromLatin1("edit"), CTRL + Key_E, + m_editEntry = new KAction(i18n("&Edit Entry..."), TQString::fromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotShowEntryEditor()), actionCollection(), "coll_edit_entry"); m_editEntry->setToolTip(i18n("Edit the selected entries")); - m_copyEntry = new KAction(i18n("D&uplicate Entry"), TQString::tqfromLatin1("editcopy"), CTRL + Key_Y, + m_copyEntry = new KAction(i18n("D&uplicate Entry"), TQString::fromLatin1("editcopy"), CTRL + Key_Y, Controller::self(), TQT_SLOT(slotCopySelectedEntries()), actionCollection(), "coll_copy_entry"); m_copyEntry->setToolTip(i18n("Copy the selected entries")); - m_deleteEntry = new KAction(i18n("&Delete Entry"), TQString::tqfromLatin1("editdelete"), CTRL + Key_D, + m_deleteEntry = new KAction(i18n("&Delete Entry"), TQString::fromLatin1("editdelete"), CTRL + Key_D, Controller::self(), TQT_SLOT(slotDeleteSelectedEntries()), actionCollection(), "coll_delete_entry"); m_deleteEntry->setToolTip(i18n("Delete the selected entries")); - m_mergeEntry = new KAction(i18n("&Merge Entries"), TQString::tqfromLatin1("editcopy"), CTRL + Key_G, + m_mergeEntry = new KAction(i18n("&Merge Entries"), TQString::fromLatin1("editcopy"), CTRL + Key_G, Controller::self(), TQT_SLOT(slotMergeSelectedEntries()), actionCollection(), "coll_merge_entry"); m_mergeEntry->setToolTip(i18n("Merge the selected entries")); m_mergeEntry->setEnabled(false); // gets enabled when more than 1 entry is selected - action = new KAction(i18n("&Generate Reports..."), TQString::tqfromLatin1("document"), 0, TQT_TQOBJECT(this), + action = new KAction(i18n("&Generate Reports..."), TQString::fromLatin1("document"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowReportDialog()), actionCollection(), "coll_reports"); action->setToolTip(i18n("Generate collection reports")); - m_checkOutEntry = new KAction(i18n("Check-&out..."), TQString::tqfromLatin1("2uparrow"), 0, + m_checkOutEntry = new KAction(i18n("Check-&out..."), TQString::fromLatin1("2uparrow"), 0, Controller::self(), TQT_SLOT(slotCheckOut()), actionCollection(), "coll_checkout"); m_checkOutEntry->setToolTip(i18n("Check-out the selected items")); - m_checkInEntry = new KAction(i18n("Check-&in"), TQString::tqfromLatin1("2downarrow"), 0, + m_checkInEntry = new KAction(i18n("Check-&in"), TQString::fromLatin1("2downarrow"), 0, Controller::self(), TQT_SLOT(slotCheckIn()), actionCollection(), "coll_checkin"); m_checkInEntry->setToolTip(i18n("Check-in the selected items")); - action = new KAction(i18n("&Rename Collection..."), TQString::tqfromLatin1("editclear"), CTRL + Key_R, + action = new KAction(i18n("&Rename Collection..."), TQString::fromLatin1("editclear"), CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotRenameCollection()), actionCollection(), "coll_rename_collection"); action->setToolTip(i18n("Rename the collection")); - action = new KAction(i18n("Collection &Fields..."), TQString::tqfromLatin1("edit"), CTRL + Key_U, + action = new KAction(i18n("Collection &Fields..."), TQString::fromLatin1("edit"), CTRL + Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotShowCollectionFieldsDialog()), actionCollection(), "coll_fields"); action->setToolTip(i18n("Modify the collection fields")); @@ -645,8 +645,8 @@ void MainWindow::initActions() { TQT_TQOBJECT(this), TQT_SLOT(slotConvertToBibliography()), actionCollection(), "coll_convert_bibliography"); action->setToolTip(i18n("Convert a book collection to a bibliography")); - action->setIconSet(UserIconSet(TQString::tqfromLatin1("bibtex"))); - action = new KAction(i18n("String &Macros..."), TQString::tqfromLatin1("view_text"), 0, + action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex"))); + action = new KAction(i18n("String &Macros..."), TQString::fromLatin1("view_text"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStringMacroDialog()), actionCollection(), "coll_string_macros"); action->setToolTip(i18n("Edit the bibtex string macros")); @@ -658,21 +658,21 @@ void MainWindow::initActions() { action = new KAction(actionCollection(), "cite_clipboard"); action->setText(i18n("Copy Bibtex to Cli&pboard")); action->setToolTip(i18n("Copy bibtex citations to the clipboard")); - action->setIcon(TQString::tqfromLatin1("editpaste")); + action->setIcon(TQString::fromLatin1("editpaste")); connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); citeMapper->setMapping(action, Cite::CiteClipboard); action = new KAction(actionCollection(), "cite_lyxpipe"); action->setText(i18n("Cite Entry in &LyX")); action->setToolTip(i18n("Cite the selected entries in LyX")); - action->setIcon(TQString::tqfromLatin1("lyx")); + action->setIcon(TQString::fromLatin1("lyx")); connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); citeMapper->setMapping(action, Cite::CiteLyxpipe); action = new KAction(actionCollection(), "cite_openoffice"); action->setText(i18n("Ci&te Entry in OpenOffice.org")); action->setToolTip(i18n("Cite the selected entries in OpenOffice.org")); - action->setIcon(TQString::tqfromLatin1("ooo-writer")); + action->setIcon(TQString::fromLatin1("ooo-writer")); connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); citeMapper->setMapping(action, Cite::CiteOpenOffice); @@ -681,7 +681,7 @@ void MainWindow::initActions() { Controller::self(), TQT_SLOT(slotUpdateSelectedEntries(const TQString&))); m_updateEntryMenu = new KActionMenu(i18n("&Update Entry"), actionCollection(), "coll_update_entry"); -// m_updateEntryMenu->setIconSet(BarIconSet(TQString::tqfromLatin1("fileexport"))); +// m_updateEntryMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileexport"))); m_updateEntryMenu->setDelayed(false); m_updateAll = new KAction(actionCollection(), "update_entry_all"); @@ -689,7 +689,7 @@ void MainWindow::initActions() { m_updateAll->setToolTip(i18n("Update entry data from all available sources")); // m_updateEntryMenu->insert(action); connect(m_updateAll, TQT_SIGNAL(activated()), updateMapper, TQT_SLOT(map())); - updateMapper->setMapping(m_updateAll, TQString::tqfromLatin1("_all")); + updateMapper->setMapping(m_updateAll, TQString::fromLatin1("_all")); /************************************************* * Settings menu @@ -738,7 +738,7 @@ void MainWindow::initActions() { (void) new KAction(i18n("Filter"), CTRL + Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotFilterLabelActivated()), actionCollection(), "quick_filter_accel"); - (void) new KAction(i18n("Clear Filter"), TQString::tqfromLatin1("locationbar_erase"), 0, + (void) new KAction(i18n("Clear Filter"), TQString::fromLatin1("locationbar_erase"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearFilter()), actionCollection(), "quick_filter_clear"); @@ -761,7 +761,7 @@ void MainWindow::initActions() { connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_SLOT(slotStatusMsg(const TQString &))); connect(actionCollection(), TQT_SIGNAL(clearStatusText()), - TQT_SLOT(slotCleartqStatus())); + TQT_SLOT(slotClearStatus())); #ifdef UIFILE kdWarning() << "MainWindow::initActions() - change createGUI() call!" << endl; @@ -801,7 +801,7 @@ void MainWindow::initView() { m_viewTabs->setTabBarHidden(true); m_groupView = new GroupView(m_viewTabs, "groupview"); Controller::self()->addObserver(m_groupView); - m_viewTabs->addTab(m_groupView, SmallIcon(TQString::tqfromLatin1("folder")), i18n("Groups")); + m_viewTabs->addTab(m_groupView, SmallIcon(TQString::fromLatin1("folder")), i18n("Groups")); TQWhatsThis::add(m_groupView, i18n("The Group View sorts the entries into groupings " "based on a selected field.")); @@ -856,16 +856,16 @@ void MainWindow::initFileOpen(bool nofile_) { slotEntryCount(); const int type = Kernel::self()->collectionType(); - TQString welcomeFile = locate("appdata", TQString::tqfromLatin1("welcome.html")); + TQString welcomeFile = locate("appdata", TQString::fromLatin1("welcome.html")); TQString text = FileHandler::readTextFile(welcomeFile); - text.replace(TQString::tqfromLatin1("$FGCOLOR$"), Config::templateTextColor(type).name()); - text.replace(TQString::tqfromLatin1("$BGCOLOR$"), Config::templateBaseColor(type).name()); - text.replace(TQString::tqfromLatin1("$COLOR1$"), Config::templateHighlightedTextColor(type).name()); - text.replace(TQString::tqfromLatin1("$COLOR2$"), Config::templateHighlightedBaseColor(type).name()); - text.replace(TQString::tqfromLatin1("$IMGDIR$"), TQFile::encodeName(ImageFactory::tempDir())); - text.replace(TQString::tqfromLatin1("$BANNER$"), + text.replace(TQString::fromLatin1("$FGCOLOR$"), Config::templateTextColor(type).name()); + text.replace(TQString::fromLatin1("$BGCOLOR$"), Config::templateBaseColor(type).name()); + text.replace(TQString::fromLatin1("$COLOR1$"), Config::templateHighlightedTextColor(type).name()); + text.replace(TQString::fromLatin1("$COLOR2$"), Config::templateHighlightedBaseColor(type).name()); + text.replace(TQString::fromLatin1("$IMGDIR$"), TQFile::encodeName(ImageFactory::tempDir())); + text.replace(TQString::fromLatin1("$BANNER$"), i18n("Welcome to the Tellico Collection Manager")); - text.replace(TQString::tqfromLatin1("$WELCOMETEXT$"), + text.replace(TQString::fromLatin1("$WELCOMETEXT$"), i18n("

Tellico is a tool for managing collections of books, " "videos, music, and whatever else you want to catalog.

" "

New entries can be added to your collection by " @@ -883,13 +883,13 @@ void MainWindow::initFileOpen(bool nofile_) { void MainWindow::saveOptions() { // myDebug() << "MainWindow::saveOptions()" << endl; - saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1("Main Window Options")); + saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); Config::setShowGroupWidget(m_toggleGroupWidget->isChecked()); Config::setShowEditWidget(m_toggleEntryEditor->isChecked()); Config::setShowEntryView(m_toggleEntryView->isChecked()); - m_fileOpenRecent->saveEntries(KGlobal::config(), TQString::tqfromLatin1("Recent Files")); + m_fileOpenRecent->saveEntries(KGlobal::config(), TQString::fromLatin1("Recent Files")); if(!isNewDocument()) { Config::setLastOpenFile(Data::Document::self()->URL().url()); } @@ -916,14 +916,14 @@ void MainWindow::saveOptions() { } // this is used in the EntryEditDialog constructor, too - m_editDialog->saveDialogSize(TQString::tqfromLatin1("Edit Dialog Options")); + m_editDialog->saveDialogSize(TQString::fromLatin1("Edit Dialog Options")); saveCollectionOptions(Data::Document::self()->collection()); Config::writeConfig(); } void MainWindow::readCollectionOptions(Data::CollPtr coll_) { - KConfigGroup group(KGlobal::config(), TQString::tqfromLatin1("Options - %1").tqarg(coll_->typeName())); + KConfigGroup group(KGlobal::config(), TQString::fromLatin1("Options - %1").tqarg(coll_->typeName())); TQString defaultGroup = coll_->defaultGroupField(); TQString entryGroup; @@ -932,9 +932,9 @@ void MainWindow::readCollectionOptions(Data::CollPtr coll_) { } else { KURL url = Kernel::self()->URL(); for(uint i = 0; i < Config::maxCustomURLSettings(); ++i) { - KURL u = group.readEntry(TQString::tqfromLatin1("URL_%1").tqarg(i)); + KURL u = group.readEntry(TQString::fromLatin1("URL_%1").tqarg(i)); if(url == u) { - entryGroup = group.readEntry(TQString::tqfromLatin1("Group By_%1").tqarg(i), defaultGroup); + entryGroup = group.readEntry(TQString::fromLatin1("Group By_%1").tqarg(i), defaultGroup); break; } } @@ -950,9 +950,9 @@ void MainWindow::readCollectionOptions(Data::CollPtr coll_) { TQString entryXSLTFile = Config::templateName(coll_->type()); if(entryXSLTFile.isEmpty()) { - entryXSLTFile = TQString::tqfromLatin1("Fancy"); // should never happen, but just in case + entryXSLTFile = TQString::fromLatin1("Fancy"); // should never happen, but just in case } - m_viewStack->entryView()->setXSLTFile(entryXSLTFile + TQString::tqfromLatin1(".xsl")); + m_viewStack->entryView()->setXSLTFile(entryXSLTFile + TQString::fromLatin1(".xsl")); // make sure the right combo element is selected slotUpdateCollectionToolBar(coll_); @@ -965,7 +965,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { } int configIndex = -1; - KConfigGroup config(KGlobal::config(), TQString::tqfromLatin1("Options - %1").tqarg(coll_->typeName())); + KConfigGroup config(KGlobal::config(), TQString::fromLatin1("Options - %1").tqarg(coll_->typeName())); TQString groupName; if(m_entryGrouping->currentItem() > -1 && static_cast(coll_->entryGroups().count()) > m_entryGrouping->currentItem()) { @@ -981,8 +981,8 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { TQValueList urls = TQValueList() << url; TQStringList groupBys = TQStringList() << groupName; for(uint i = 0; i < Config::maxCustomURLSettings(); ++i) { - KURL u = config.readEntry(TQString::tqfromLatin1("URL_%1").tqarg(i)); - TQString g = config.readEntry(TQString::tqfromLatin1("Group By_%1").tqarg(i)); + KURL u = config.readEntry(TQString::fromLatin1("URL_%1").tqarg(i)); + TQString g = config.readEntry(TQString::fromLatin1("Group By_%1").tqarg(i)); if(!u.isEmpty() && url != u) { urls.append(u); groupBys.append(g); @@ -992,8 +992,8 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { } uint limit = TQMIN(urls.count(), Config::maxCustomURLSettings()); for(uint i = 0; i < limit; ++i) { - config.writeEntry(TQString::tqfromLatin1("URL_%1").tqarg(i), urls[i].url()); - config.writeEntry(TQString::tqfromLatin1("Group By_%1").tqarg(i), groupBys[i]); + config.writeEntry(TQString::fromLatin1("URL_%1").tqarg(i), urls[i].url()); + config.writeEntry(TQString::fromLatin1("Group By_%1").tqarg(i), groupBys[i]); } } m_detailedView->saveConfig(coll_, configIndex); @@ -1002,7 +1002,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { void MainWindow::readOptions() { // myDebug() << "MainWindow::readOptions()" << endl; - applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1("Main Window Options")); + applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); TQValueList splitList = Config::mainSplitterSizes(); if(!splitList.empty()) { @@ -1025,7 +1025,7 @@ void MainWindow::readOptions() { slotToggleEntryView(); // initialize the recent file list - m_fileOpenRecent->loadEntries(KGlobal::config(), TQString::tqfromLatin1("Recent Files")); + m_fileOpenRecent->loadEntries(KGlobal::config(), TQString::fromLatin1("Recent Files")); // sort by count if column = 1 int sortStyle = Config::groupViewSortColumn(); @@ -1061,8 +1061,8 @@ void MainWindow::saveProperties(KConfig* cfg_) { } void MainWindow::readProperties(KConfig* cfg_) { - TQString filename = cfg_->readEntry(TQString::tqfromLatin1("filename")); - bool modified = cfg_->readBoolEntry(TQString::tqfromLatin1("modified"), false); + TQString filename = cfg_->readEntry(TQString::fromLatin1("filename")); + bool modified = cfg_->readBoolEntry(TQString::fromLatin1("modified"), false); if(modified) { bool canRecover; TQString tempname = kapp->checkRecoverFile(filename, canRecover); @@ -1127,7 +1127,7 @@ void MainWindow::slotFileNew(int type_) { ImageFactory::clean(false); } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotFileOpen() { @@ -1135,18 +1135,18 @@ void MainWindow::slotFileOpen() { if(m_editDialog->queryModified() && Data::Document::self()->saveModified()) { TQString filter = i18n("*.tc *.bc|Tellico Files (*.tc)"); - filter += TQString::tqfromLatin1("\n"); + filter += TQString::fromLatin1("\n"); filter += i18n("*.xml|XML Files (*.xml)"); - filter += TQString::tqfromLatin1("\n"); + filter += TQString::fromLatin1("\n"); filter += i18n("*|All Files"); // keyword 'open' - KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":open"), filter, + KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":open"), filter, this, i18n("Open File")); if(!url.isEmpty() && url.isValid()) { slotFileOpen(url); } } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotFileOpen(const KURL& url_) { @@ -1164,7 +1164,7 @@ void MainWindow::slotFileOpen(const KURL& url_) { } } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotFileOpenRecent(const KURL& url_) { @@ -1183,7 +1183,7 @@ void MainWindow::slotFileOpenRecent(const KURL& url_) { m_fileOpenRecent->setCurrentItem(-1); } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::openFile(const TQString& file_) { @@ -1279,13 +1279,13 @@ bool MainWindow::fileSave() { m_newDocument = false; updateCaption(false); m_fileSave->setEnabled(false); - m_detailedView->resetEntrytqStatus(); + m_detailedView->resetEntryStatus(); } else { ret = false; } } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return ret; } @@ -1305,13 +1305,13 @@ bool MainWindow::fileSaveAs() { filter += i18n("*|All Files"); // keyword 'open' - KFileDialog dlg(TQString::tqfromLatin1(":open"), filter, this, "filedialog", true); + KFileDialog dlg(TQString::fromLatin1(":open"), filter, this, "filedialog", true); dlg.setCaption(i18n("Save As")); dlg.setOperationMode(KFileDialog::Saving); int result = dlg.exec(); if(result == TQDialog::Rejected) { - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return false; } @@ -1325,13 +1325,13 @@ bool MainWindow::fileSaveAs() { updateCaption(false); m_newDocument = false; m_fileSave->setEnabled(false); - m_detailedView->resetEntrytqStatus(); + m_detailedView->resetEntryStatus(); } else { ret = false; } } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return ret; } @@ -1348,9 +1348,9 @@ void MainWindow::slotFilePrint() { TQString str = i18n("The collection is currently being filtered to show a limited subset of " "the entries. Only the visible entries will be printed. Continue?"); int ret = KMessageBox::warningContinueCancel(this, str, TQString(), KStdGuiItem::print(), - TQString::tqfromLatin1("WarnPrintVisible")); + TQString::fromLatin1("WarnPrintVisible")); if(ret == KMessageBox::Cancel) { - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return; } } @@ -1360,7 +1360,7 @@ void MainWindow::slotFilePrint() { Export::HTMLExporter exporter(Data::Document::self()->collection()); // only print visible entries exporter.setEntries(m_detailedView->visibleEntries()); - exporter.setXSLTFile(TQString::tqfromLatin1("tellico-printing.xsl")); + exporter.setXSLTFile(TQString::fromLatin1("tellico-printing.xsl")); exporter.setPrintHeaders(printHeaders); exporter.setPrintGrouped(printGrouped); exporter.setGroupBy(Controller::self()->expandedGroupBy()); @@ -1379,7 +1379,7 @@ void MainWindow::slotFilePrint() { TQString html = exporter.text(); if(html.isEmpty()) { XSLTError(); - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return; } @@ -1389,7 +1389,7 @@ void MainWindow::slotFilePrint() { slotStatusMsg(i18n("Printing...")); doPrint(html); - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotFileQuit() { @@ -1399,7 +1399,7 @@ void MainWindow::slotFileQuit() { //saveOptions(); close(); - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotEditCut() { @@ -1418,13 +1418,13 @@ void MainWindow::activateEditSlot(const char* slot_) { // the edit widget is the only one that copies, cuts, and pastes TQWidget* w; if(m_editDialog->isVisible()) { - w = m_editDialog->tqfocusWidget(); + w = m_editDialog->focusWidget(); } else { - w = kapp->tqfocusWidget(); + w = kapp->focusWidget(); } if(w && w->isVisible()) { - TQMetaObject* meta = w->tqmetaObject(); + TQMetaObject* meta = w->metaObject(); int idx = meta->findSlot(slot_ + 1, true); if(idx > -1) { @@ -1442,7 +1442,7 @@ void MainWindow::slotEditDeselect() { } void MainWindow::slotConfigToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1("Main Window Options")); + saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); #ifdef UIFILE KEditToolbar dlg(actionCollection(), UIFILE); #else @@ -1453,7 +1453,7 @@ void MainWindow::slotConfigToolbar() { } void MainWindow::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1("Main Window Options")); + applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); #ifdef UIFILE createGUI(UIFILE, false); #else @@ -1512,16 +1512,16 @@ void MainWindow::slotHideConfigDialog() { } void MainWindow::slotShowTipOfDay(bool force_/*=true*/) { - TQString tipfile = locate("appdata", TQString::tqfromLatin1("tellico.tips")); + TQString tipfile = locate("appdata", TQString::fromLatin1("tellico.tips")); KTipDialog::showTip(this, tipfile, force_); } void MainWindow::slotStatusMsg(const TQString& text_) { - m_statusBar->settqStatus(text_); + m_statusBar->setStatus(text_); } -void MainWindow::slotCleartqStatus() { - StatusBar::self()->cleartqStatus(); +void MainWindow::slotClearStatus() { + StatusBar::self()->clearStatus(); } void MainWindow::slotEntryCount() { @@ -1594,11 +1594,11 @@ void MainWindow::slotHandleConfigChange() { // tqinvalidate all groups Data::Document::self()->collection()->invalidateGroups(); // refreshing the title causes the group view to refresh - Controller::self()->slotRefreshField(Data::Document::self()->collection()->fieldByName(TQString::tqfromLatin1("title"))); + Controller::self()->slotRefreshField(Data::Document::self()->collection()->fieldByName(TQString::fromLatin1("title"))); } TQString entryXSLTFile = Config::templateName(Kernel::self()->collectionType()); - m_viewStack->entryView()->setXSLTFile(entryXSLTFile + TQString::tqfromLatin1(".xsl")); + m_viewStack->entryView()->setXSLTFile(entryXSLTFile + TQString::fromLatin1(".xsl")); } void MainWindow::slotUpdateCollectionToolBar(Data::CollPtr coll_) { @@ -1624,7 +1624,7 @@ void MainWindow::slotUpdateCollectionToolBar(Data::CollPtr coll_) { for(TQStringList::ConstIterator groupIt = groups.begin(); groupIt != groups.end(); ++groupIt) { // special case for people "pseudo-group" if(*groupIt == Data::Collection::s_peopleGroupName) { - groupMap.insert(*groupIt, TQString::tqfromLatin1("<") + i18n("People") + TQString::tqfromLatin1(">")); + groupMap.insert(*groupIt, TQString::fromLatin1("<") + i18n("People") + TQString::fromLatin1(">")); } else { groupMap.insert(*groupIt, coll_->fieldTitleByName(*groupIt)); } @@ -1649,8 +1649,8 @@ void MainWindow::slotUpdateCollectionToolBar(Data::CollPtr coll_) { if(tb) { KComboBox* cb = tb->getCombo(m_entryGrouping->itemId(i)); if(cb) { - // qt caches the combobox size and never recalculates the tqsizeHint() - // the source code recommends calling setFont to tqinvalidate the tqsizeHint + // qt caches the combobox size and never recalculates the sizeHint() + // the source code recommends calling setFont to tqinvalidate the sizeHint cb->setFont(cb->font()); cb->updateGeometry(); } @@ -1664,7 +1664,7 @@ void MainWindow::slotChangeGrouping() { TQString groupName = Kernel::self()->fieldNameByTitle(title); if(groupName.isEmpty()) { - if(title == TQString::tqfromLatin1("<") + i18n("People") + TQString::tqfromLatin1(">")) { + if(title == TQString::fromLatin1("<") + i18n("People") + TQString::fromLatin1(">")) { groupName = Data::Collection::s_peopleGroupName; } else { groupName = Data::Document::self()->collection()->defaultGroupField(); @@ -1714,18 +1714,18 @@ void MainWindow::doPrint(const TQString& html_) { if(printer->setup(this, i18n("Print %1").tqarg(Data::Document::self()->URL().prettyURL()))) { printer->setFullPage(false); - printer->setCreator(TQString::tqfromLatin1("Tellico")); + printer->setCreator(TQString::fromLatin1("Tellico")); printer->setDocName(Data::Document::self()->URL().prettyURL()); TQPainter *p = new TQPainter; p->begin(printer); // mostly taken from KHTMLView::print() - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), false); + TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(), false); TQString headerRight = Data::Document::self()->URL().prettyURL(); TQString footerMid; - TQFont headerFont(TQString::tqfromLatin1("helvetica"), 8); + TQFont headerFont(TQString::fromLatin1("helvetica"), 8); p->setFont(headerFont); const int lspace = p->fontMetrics().lineSpacing(); const int headerHeight = (lspace * 3) / 2; @@ -1835,10 +1835,10 @@ void MainWindow::setFilter(const TQString& text_) { } // if the text contains any non-word characters, assume it's a regexp // but \W in qt is letter, number, or '_', I want to be a bit less strict - TQRegExp rx(TQString::tqfromLatin1("[^\\w\\s-']")); + TQRegExp rx(TQString::fromLatin1("[^\\w\\s-']")); if(text.find(rx) == -1) { // split by whitespace, and add rules for each word - TQStringList tokens = TQStringList::split(TQRegExp(TQString::tqfromLatin1("\\s")), text); + TQStringList tokens = TQStringList::split(TQRegExp(TQString::fromLatin1("\\s")), text); for(TQStringList::Iterator it = tokens.begin(); it != tokens.end(); ++it) { // an empty field string means check every field filter->append(new FilterRule(fieldName, *it, FilterRule::FuncContains)); @@ -1909,12 +1909,12 @@ void MainWindow::slotFileImport(int format_) { if(checkURL) { bool ok = !url.isEmpty() && url.isValid() && KIO::NetAccess::exists(url, true, this); if(!ok) { - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return; } } importFile(format, url); - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotFileExport(int format_) { @@ -1924,7 +1924,7 @@ void MainWindow::slotFileExport(int format_) { ExportDialog dlg(format, Data::Document::self()->collection(), this, "exportdialog"); if(dlg.exec() == TQDialog::Rejected) { - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return; } @@ -1939,12 +1939,12 @@ void MainWindow::slotFileExport(int format_) { case Export::File: { - KFileDialog fileDlg(TQString::tqfromLatin1(":export"), dlg.fileFilter(), this, "filedialog", true); + KFileDialog fileDlg(TQString::fromLatin1(":export"), dlg.fileFilter(), this, "filedialog", true); fileDlg.setCaption(i18n("Export As")); fileDlg.setOperationMode(KFileDialog::Saving); if(fileDlg.exec() == TQDialog::Rejected) { - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return; } @@ -1957,7 +1957,7 @@ void MainWindow::slotFileExport(int format_) { break; } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotShowStringMacroDialog() { @@ -2032,9 +2032,9 @@ void MainWindow::slotConvertToBibliography() { } void MainWindow::slotCiteEntry(int action_) { - StatusBar::self()->settqStatus(i18n("Creating citations...")); + StatusBar::self()->setStatus(i18n("Creating citations...")); Cite::ActionManager::self()->cite(static_cast(action_), Controller::self()->selectedEntries()); - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); } void MainWindow::slotShowFetchDialog() { @@ -2091,7 +2091,7 @@ bool MainWindow::importFile(Import::Format format_, const KURL& url_, Import::Ac failed = !importCollection(coll, action_); } - StatusBar::self()->cleartqStatus(); + StatusBar::self()->clearStatus(); return !failed; // return true means success } @@ -2137,7 +2137,7 @@ void MainWindow::addFilterView() { m_filterView = new FilterView(m_viewTabs, "filterview"); Controller::self()->addObserver(m_filterView); - m_viewTabs->insertTab(m_filterView, SmallIcon(TQString::tqfromLatin1("filter")), i18n("Filters"), 1); + m_viewTabs->insertTab(m_filterView, SmallIcon(TQString::fromLatin1("filter")), i18n("Filters"), 1); TQWhatsThis::add(m_filterView, i18n("The Filter View shows the entries which meet certain " "filter rules.")); @@ -2154,7 +2154,7 @@ void MainWindow::addLoanView() { m_loanView = new LoanView(m_viewTabs, "loanview"); Controller::self()->addObserver(m_loanView); - m_viewTabs->insertTab(m_loanView, SmallIcon(TQString::tqfromLatin1("kaddressbook")), i18n("Loans"), 2); + m_viewTabs->insertTab(m_loanView, SmallIcon(TQString::fromLatin1("kaddressbook")), i18n("Loans"), 2); TQWhatsThis::add(m_loanView, i18n("The Loan View shows a list of all the people who " "have borrowed items from your collection.")); @@ -2171,7 +2171,7 @@ void MainWindow::updateCaption(bool modified_) { } if(!m_newDocument) { if(!caption.isEmpty()) { - caption += TQString::tqfromLatin1(" - "); + caption += TQString::fromLatin1(" - "); } KURL u = Data::Document::self()->URL(); if(u.isLocalFile()) { @@ -2247,17 +2247,17 @@ void MainWindow::updateCollectionActions() { return; } - stateChanged(TQString::tqfromLatin1("collection_reset")); + stateChanged(TQString::fromLatin1("collection_reset")); Data::Collection::Type type = Data::Document::self()->collection()->type(); switch(type) { case Data::Collection::Book: - stateChanged(TQString::tqfromLatin1("is_book")); + stateChanged(TQString::fromLatin1("is_book")); break; case Data::Collection::Bibtex: - stateChanged(TQString::tqfromLatin1("is_bibliography")); + stateChanged(TQString::fromLatin1("is_bibliography")); break; case Data::Collection::Video: - stateChanged(TQString::tqfromLatin1("is_video")); + stateChanged(TQString::fromLatin1("is_video")); break; default: break; @@ -2276,7 +2276,7 @@ void MainWindow::updateEntrySources() { return; } - unplugActionList(TQString::tqfromLatin1("update_entry_actions")); + unplugActionList(TQString::fromLatin1("update_entry_actions")); for(TQPtrListIterator it(m_fetchActions); it.current(); ++it) { it.current()->unplugAll(); mapper->removeMappings(it.current()); @@ -2295,7 +2295,7 @@ void MainWindow::updateEntrySources() { m_fetchActions.append(action); } - plugActionList(TQString::tqfromLatin1("update_entry_actions"), m_fetchActions); + plugActionList(TQString::fromLatin1("update_entry_actions"), m_fetchActions); } void MainWindow::importFile(Import::Format format_, const KURL::List& urls_) { -- cgit v1.2.1