summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bookmark.h2
-rw-r--r--src/bookmarksdlg.cpp20
-rw-r--r--src/bookmarksdlg.h4
-rw-r--r--src/bookreader.cpp6
-rw-r--r--src/bookwidget.cpp8
-rw-r--r--src/bookwidget.h2
-rw-r--r--src/settingsdlg.ui8
7 files changed, 25 insertions, 25 deletions
diff --git a/src/bookmark.h b/src/bookmark.h
index 7662528..77c2ef3 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::currentDateTime());
+ TQDateTime dateTime = TQDateTime::tqcurrentDateTime());
~Bookmark();
void setPage(unsigned int page) { m_page = page; }
diff --git a/src/bookmarksdlg.cpp b/src/bookmarksdlg.cpp
index b4f8f63..5a9907d 100644
--- a/src/bookmarksdlg.cpp
+++ b/src/bookmarksdlg.cpp
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
#include <tqheader.h>
#include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -45,7 +45,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
setSizeGripEnabled(TRUE);
BookmarksDlgLayout = new TQVBoxLayout( this, 11, 6, "BookmarksDlgLayout");
- layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
+ tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
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);
- layout3->addWidget( bookmarksTable );
+ tqlayout3->addWidget( bookmarksTable );
- layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
+ tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
addButton = new TQPushButton( this, "addButton" );
- layout2->addWidget( addButton );
+ tqlayout2->addWidget( addButton );
deleteButton = new TQPushButton( this, "deleteButton" );
- layout2->addWidget( deleteButton );
+ tqlayout2->addWidget( deleteButton );
Horizontal_Spacing2_2 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- layout2->addItem( Horizontal_Spacing2_2 );
- layout3->addLayout( layout2 );
- BookmarksDlgLayout->addLayout( layout3 );
+ tqlayout2->addItem( Horizontal_Spacing2_2 );
+ tqlayout3->addLayout( tqlayout2 );
+ BookmarksDlgLayout->addLayout( tqlayout3 );
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(minimumSizeHint()) );
+ resize( TQSize(400, 267).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
updateBookmarks();
diff --git a/src/bookmarksdlg.h b/src/bookmarksdlg.h
index b424f14..4dc7c4a 100644
--- a/src/bookmarksdlg.h
+++ b/src/bookmarksdlg.h
@@ -53,8 +53,8 @@ public:
protected:
TQVBoxLayout* BookmarksDlgLayout;
- TQHBoxLayout* layout3;
- TQVBoxLayout* layout2;
+ TQHBoxLayout* tqlayout3;
+ TQVBoxLayout* tqlayout2;
TQSpacerItem* Horizontal_Spacing2_2;
TQHBoxLayout* Layout1;
TQSpacerItem* Horizontal_Spacing2;
diff --git a/src/bookreader.cpp b/src/bookreader.cpp
index 2b45219..e436676 100644
--- a/src/bookreader.cpp
+++ b/src/bookreader.cpp
@@ -46,7 +46,7 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
#include <tqpixmap.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqsignalmapper.h>
#include <assert.h>
#include "bookreader.h"
@@ -304,7 +304,7 @@ void BookReader::optionsPreferences()
TQString curEncoding(encodings[Settings::defaultEncoding()]);
if (curEncoding.isEmpty())
- curEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+ curEncoding = TQString::tqfromLatin1(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%").arg(lastURL.fileName()).arg(loaded));
+ m_splash->message(tqtr("Loading: %1 - %2%").tqarg(lastURL.fileName()).tqarg(loaded));
}
void BookReader::gotoFirstPage()
diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp
index d1a2d62..6cbdf10 100644
--- a/src/bookwidget.cpp
+++ b/src/bookwidget.cpp
@@ -22,8 +22,8 @@
#include <kdebug.h>
#include <kprogress.h>
#include <tqfile.h>
-#include <textstream.h>
-#include <textcodec.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
#include <tqstring.h>
#include <kglobal.h>
#include <kstandarddirs.h>
@@ -296,7 +296,7 @@ void BookWidget::resizeEvent(TQResizeEvent * e)
TQWidget::resizeEvent(e);
}
-TQSize BookWidget::minimumSizeHint() const
+TQSize BookWidget::tqminimumSizeHint() 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").arg(i));
+ config.setGroup(tqtr("Bookmark %1").tqarg(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 381cb47..8e60fd7 100644
--- a/src/bookwidget.h
+++ b/src/bookwidget.h
@@ -59,7 +59,7 @@ public:
void prevPage();
void firstPage();
void lastPage();
- TQSize minimumSizeHint () const;
+ TQSize tqminimumSizeHint () const;
void setupPageSize();
void setEncoding(int);
void setEncoding(const TQString & a_encoding);
diff --git a/src/settingsdlg.ui b/src/settingsdlg.ui
index c867c63..4f8797d 100644
--- a/src/settingsdlg.ui
+++ b/src/settingsdlg.ui
@@ -41,7 +41,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -67,7 +67,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 12:24:47 +0000