From e0dc67e60c2050d70a7a15c6e5f84ea651294d7c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:30:10 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- src/bookmark.h | 2 +- src/bookmarksdlg.cpp | 20 ++++++++++---------- src/bookmarksdlg.h | 4 ++-- src/bookreader.cpp | 6 +++--- src/bookwidget.cpp | 8 ++++---- src/bookwidget.h | 2 +- src/settingsdlg.ui | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/bookmark.h b/src/bookmark.h index 77c2ef3..7662528 100644 --- a/src/bookmark.h +++ b/src/bookmark.h @@ -33,7 +33,7 @@ class Bookmark { public: Bookmark(int page, const TQString& name = TQString(), - TQDateTime dateTime = TQDateTime::tqcurrentDateTime()); + TQDateTime dateTime = TQDateTime::currentDateTime()); ~Bookmark(); void setPage(unsigned int page) { m_page = page; } diff --git a/src/bookmarksdlg.cpp b/src/bookmarksdlg.cpp index 5a9907d..b4f8f63 100644 --- a/src/bookmarksdlg.cpp +++ b/src/bookmarksdlg.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent, setSizeGripEnabled(TRUE); BookmarksDlgLayout = new TQVBoxLayout( this, 11, 6, "BookmarksDlgLayout"); - tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); bookmarksTable = new TQTable(3, 2, this, "bookmarksList" ); bookmarksTable->horizontalHeader()->setLabel(0, "Title"); @@ -53,19 +53,19 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent, // bookmarksTable->setLeftMargin(0); bookmarksTable->setColumnStretchable(0, true); bookmarksTable->setSelectionMode(TQTable::SingleRow); - tqlayout3->addWidget( bookmarksTable ); + layout3->addWidget( bookmarksTable ); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); addButton = new TQPushButton( this, "addButton" ); - tqlayout2->addWidget( addButton ); + layout2->addWidget( addButton ); deleteButton = new TQPushButton( this, "deleteButton" ); - tqlayout2->addWidget( deleteButton ); + layout2->addWidget( deleteButton ); Horizontal_Spacing2_2 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout2->addItem( Horizontal_Spacing2_2 ); - tqlayout3->addLayout( tqlayout2 ); - BookmarksDlgLayout->addLayout( tqlayout3 ); + layout2->addItem( Horizontal_Spacing2_2 ); + layout3->addLayout( layout2 ); + BookmarksDlgLayout->addLayout( layout3 ); Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); @@ -85,7 +85,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent, Layout1->addWidget( buttonCancel ); BookmarksDlgLayout->addLayout( Layout1 ); languageChange(); - resize( TQSize(400, 267).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(400, 267).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); updateBookmarks(); diff --git a/src/bookmarksdlg.h b/src/bookmarksdlg.h index 4dc7c4a..b424f14 100644 --- a/src/bookmarksdlg.h +++ b/src/bookmarksdlg.h @@ -53,8 +53,8 @@ public: protected: TQVBoxLayout* BookmarksDlgLayout; - TQHBoxLayout* tqlayout3; - TQVBoxLayout* tqlayout2; + TQHBoxLayout* layout3; + TQVBoxLayout* layout2; TQSpacerItem* Horizontal_Spacing2_2; TQHBoxLayout* Layout1; TQSpacerItem* Horizontal_Spacing2; diff --git a/src/bookreader.cpp b/src/bookreader.cpp index e436676..2b45219 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include "bookreader.h" @@ -304,7 +304,7 @@ void BookReader::optionsPreferences() TQString curEncoding(encodings[Settings::defaultEncoding()]); if (curEncoding.isEmpty()) - curEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); + curEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); general->kcfg_DefaultEncoding->clear(); general->kcfg_DefaultEncoding->insertStringList(encodings); @@ -405,7 +405,7 @@ void BookReader::loadLastUrl() void BookReader::loaded(int loaded) { //m_loaded = loaded; - m_splash->message(tqtr("Loading: %1 - %2%").tqarg(lastURL.fileName()).tqarg(loaded)); + m_splash->message(tqtr("Loading: %1 - %2%").arg(lastURL.fileName()).arg(loaded)); } void BookReader::gotoFirstPage() diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp index 6cbdf10..d1a2d62 100644 --- a/src/bookwidget.cpp +++ b/src/bookwidget.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -296,7 +296,7 @@ void BookWidget::resizeEvent(TQResizeEvent * e) TQWidget::resizeEvent(e); } -TQSize BookWidget::tqminimumSizeHint() const +TQSize BookWidget::minimumSizeHint() const { return TQSize(400, 300); } @@ -429,7 +429,7 @@ void BookWidget::saveBookmarks( ) for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i) { const Bookmark & bm = m_bookmarks[i]; - config.setGroup(tqtr("Bookmark %1").tqarg(i)); + config.setGroup(tqtr("Bookmark %1").arg(i)); config.writeEntry("page", bm.page()); config.writeEntry("name", bm.name()); config.writeEntry("dateTime", bm.dateTime()); diff --git a/src/bookwidget.h b/src/bookwidget.h index 8e60fd7..381cb47 100644 --- a/src/bookwidget.h +++ b/src/bookwidget.h @@ -59,7 +59,7 @@ public: void prevPage(); void firstPage(); void lastPage(); - TQSize tqminimumSizeHint () const; + TQSize minimumSizeHint () const; void setupPageSize(); void setEncoding(int); void setEncoding(const TQString & a_encoding); diff --git a/src/settingsdlg.ui b/src/settingsdlg.ui index 4f8797d..c867c63 100644 --- a/src/settingsdlg.ui +++ b/src/settingsdlg.ui @@ -41,7 +41,7 @@ - tqlayout2 + layout2 @@ -67,7 +67,7 @@ - tqlayout3 + layout3 @@ -93,7 +93,7 @@ - tqlayout8 + layout8 @@ -138,7 +138,7 @@ Expanding - + 20 30