diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:09:24 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-30 01:21:38 +0200 |
| commit | ff734eeec199e807badaf7f826163c21dfb12aa4 (patch) | |
| tree | 639c9d6bce1edc0f71a6e4fded9a76b07173ce81 | |
| parent | 3db5fa06ba1964bdf6e85cfcd6ccc0cf1d842a81 (diff) | |
| download | kbookreader-ff734eeec199e807badaf7f826163c21dfb12aa4.tar.gz kbookreader-ff734eeec199e807badaf7f826163c21dfb12aa4.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 566fa57d9805898fc20e950541c5793f03676eed)
| -rw-r--r-- | src/bookmark.h | 2 | ||||
| -rw-r--r-- | src/bookmarksdlg.cpp | 2 | ||||
| -rw-r--r-- | src/bookreader.cpp | 2 | ||||
| -rw-r--r-- | src/bookwidget.cpp | 2 | ||||
| -rw-r--r-- | src/bookwidget.h | 2 | ||||
| -rw-r--r-- | src/settingsdlg.ui | 2 |
6 files changed, 6 insertions, 6 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..a02b562 100644 --- a/src/bookmarksdlg.cpp +++ b/src/bookmarksdlg.cpp @@ -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/bookreader.cpp b/src/bookreader.cpp index 9687e56..54d4e7d 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -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); diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp index 6cbdf10..1d7954d 100644 --- a/src/bookwidget.cpp +++ b/src/bookwidget.cpp @@ -296,7 +296,7 @@ void BookWidget::resizeEvent(TQResizeEvent * e) TQWidget::resizeEvent(e); } -TQSize BookWidget::tqminimumSizeHint() const +TQSize BookWidget::minimumSizeHint() const { return TQSize(400, 300); } 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..bb1de15 100644 --- a/src/settingsdlg.ui +++ b/src/settingsdlg.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> |