summaryrefslogtreecommitdiffstats
path: root/kviewshell
diff options
context:
space:
mode:
Diffstat (limited to 'kviewshell')
-rw-r--r--kviewshell/documentPageCache.cpp2
-rw-r--r--kviewshell/kmultipage.cpp2
-rw-r--r--kviewshell/kprintDialogPage_pageoptions.cpp2
-rw-r--r--kviewshell/marklist.cpp6
-rw-r--r--kviewshell/optionDialogAccessibilityWidget.ui6
-rw-r--r--kviewshell/pageView.h4
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp2
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp8
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuImage.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp6
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPort.h4
-rw-r--r--kviewshell/searchWidget.cpp14
-rw-r--r--kviewshell/searchWidget.h2
-rw-r--r--kviewshell/selection.cpp8
15 files changed, 35 insertions, 35 deletions
diff --git a/kviewshell/documentPageCache.cpp b/kviewshell/documentPageCache.cpp
index addaa706..720285df 100644
--- a/kviewshell/documentPageCache.cpp
+++ b/kviewshell/documentPageCache.cpp
@@ -220,7 +220,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr)
// We always set the cache capacity to be at least n times the cost of the page we want to insert.
// Where n is the number of pages that can be visible at the same time at very high zoomlevels.
- // n depends on the tqlayout mode.
+ // n depends on the layout mode.
// If these pages are not all in the cache, scrolling the view becomes very slow, because for each
// paint event the pages need to be rerendered.
// We set n for each viewmode differently so that the user is able to reduce memory consuption by
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index 7d8f29de..4be278a4 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -117,7 +117,7 @@ void KMultiPage::readSettings()
void KMultiPage::writeSettings()
{
- // Save TOC tqlayout
+ // Save TOC layout
tableOfContents->writeSettings();
KVSPrefs::setGuiLayout(splitterWidget->sizes());
diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp
index 62ce70be..c0c4b15e 100644
--- a/kviewshell/kprintDialogPage_pageoptions.cpp
+++ b/kviewshell/kprintDialogPage_pageoptions.cpp
@@ -33,7 +33,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co
kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout");
if (kprintDialogPage_pageoptions_baseLayout == 0) {
- kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create tqlayout" << endl;
+ kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create layout" << endl;
return;
}
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index ae99982d..bedbb6ad 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -169,16 +169,16 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag
: TQWidget(_parent), showThumbnail(_showThumbnail), pageNumber(_pageNumber),
pageCache(_pageCache), markList(_markList)
{
- TQBoxLayout* tqlayout = new TQVBoxLayout(this, margin);
+ TQBoxLayout* layout = new TQVBoxLayout(this, margin);
thumbnailWidget = 0;
if (showThumbnail)
{
thumbnailWidget = new ThumbnailWidget(this, pageNumber, pageCache);
- tqlayout->addWidget(thumbnailWidget, 1, TQt::AlignTop);
+ layout->addWidget(thumbnailWidget, 1, TQt::AlignTop);
}
- TQBoxLayout* bottomLayout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout* bottomLayout = new TQHBoxLayout(layout);
checkBox = new TQCheckBox(TQString(), this );
checkBox->setFocusPolicy(TQ_NoFocus);
diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui
index ea0cc6d2..2bf421a0 100644
--- a/kviewshell/optionDialogAccessibilityWidget.ui
+++ b/kviewshell/optionDialogAccessibilityWidget.ui
@@ -122,7 +122,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -199,7 +199,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -332,7 +332,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h
index 637a7e23..14b6fab2 100644
--- a/kviewshell/pageView.h
+++ b/kviewshell/pageView.h
@@ -106,8 +106,8 @@ public slots:
/** Turn the scrollbars on/off. */
void slotShowScrollbars(bool);
- /** Set tqlayout of the page widgets according to the current viewmode and zoomlevel.
- Set zoomChanged = true if the the tqlayout needs updateing because the zoomlevel has changed. */
+ /** Set layout of the page widgets according to the current viewmode and zoomlevel.
+ Set zoomChanged = true if the the layout needs updateing because the zoomlevel has changed. */
void layoutPages(bool zoomChanged = false);
void slotEnableMoveTool(bool enable);
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
index 2fe05a8b..24b7dfbb 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
@@ -36,7 +36,7 @@ KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions(
kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout");
if (kprintDialogPage_pageoptions_baseLayout == 0) {
- kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl;
+ kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl;
return;
}
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
index 4287fe54..e6872648 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
@@ -40,7 +40,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa
kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout");
if (kprintDialogPage_pageoptions_baseLayout == 0) {
- kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl;
+ kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl;
return;
}
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index 802f0edf..f384ce97 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -428,7 +428,7 @@ DjVuImage::notify_chunk_done(const DjVuPort *, const GUTF8String & name)
!name.cmp("PMxx", 2) ||
!name.cmp("BMxx", 2) ) )
{
- DjVuPort::get_portcaster()->notify_retqlayout(this);
+ DjVuPort::get_portcaster()->notify_relayout(this);
relayout_sent=true;
}
else if (!name.cmp("Sxxx", 1) ||
@@ -461,7 +461,7 @@ public:
GP<DataPool> request_data(const DjVuPort *src, const GURL & url);
void notify_chunk_done(const DjVuPort *, const GUTF8String &name);
void notify_redisplay(const class DjVuImage * source);
- void notify_retqlayout(const class DjVuImage * source);
+ void notify_relayout(const class DjVuImage * source);
};
DjVuImageNotifier::DjVuImageNotifier(DjVuInterface *notifier)
@@ -485,10 +485,10 @@ DjVuImageNotifier::notify_redisplay(const class DjVuImage * source)
}
void
-DjVuImageNotifier::notify_retqlayout(const class DjVuImage * source)
+DjVuImageNotifier::notify_relayout(const class DjVuImage * source)
{
if (notifier)
- notifier->notify_retqlayout();
+ notifier->notify_relayout();
}
void
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
index aabf9ecf..57b40938 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
@@ -123,7 +123,7 @@ class DjVuInterface
public:
virtual ~DjVuInterface();
virtual void notify_chunk(const char *chkid, const char *msg) = 0;
- virtual void notify_retqlayout(void) = 0;
+ virtual void notify_relayout(void) = 0;
virtual void notify_redisplay(void) = 0;
};
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
index 8cf9b967..5e8a25c9 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
@@ -557,12 +557,12 @@ DjVuPortcaster::notify_redisplay(const DjVuImage * source)
}
void
-DjVuPortcaster::notify_retqlayout(const DjVuImage * source)
+DjVuPortcaster::notify_relayout(const DjVuImage * source)
{
GPList<DjVuPort> list;
compute_closure(source, list);
for(GPosition pos=list; pos; ++pos)
- list[pos]->notify_retqlayout(source);
+ list[pos]->notify_relayout(source);
}
void
@@ -626,7 +626,7 @@ void
DjVuPort::notify_redisplay(const DjVuImage *) {}
void
-DjVuPort::notify_retqlayout(const DjVuImage *) {}
+DjVuPort::notify_relayout(const DjVuImage *) {}
void
DjVuPort::notify_chunk_done(const DjVuPort *, const GUTF8String &) {}
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
index 3c742128..99c165fb 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
@@ -216,7 +216,7 @@ public:
/** This notification is sent by \ref{DjVuImage} when its geometry
has been changed as a result of decoding. It may be used to
implement progressive redisplay. */
- virtual void notify_retqlayout(const class DjVuImage * source);
+ virtual void notify_relayout(const class DjVuImage * source);
/** This notification is sent when a new chunk has been decoded. */
virtual void notify_chunk_done(const DjVuPort * source, const GUTF8String &name);
@@ -448,7 +448,7 @@ public:
/** Computes destination list for #source# and calls the corresponding
function in each of the ports from the destination list starting from
the closest. */
- virtual void notify_retqlayout(const class DjVuImage * source);
+ virtual void notify_relayout(const class DjVuImage * source);
/** Computes destination list for #source# and calls the corresponding
function in each of the ports from the destination list starting from
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index b7001240..38c0644c 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -43,34 +43,34 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
- tqlayout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
+ layout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
stopButton = new TQPushButton(this, "stopButton");
stopButton->setPixmap(KGlobal::iconLoader()->loadIcon("stop", KIcon::Small, KIcon::SizeSmall));
- tqlayout->addWidget(stopButton);
+ layout->addWidget(stopButton);
searchLabel = new TQLabel(this, "searchLabel");
searchLabel->setText(i18n("Search:"));
- tqlayout->addWidget(searchLabel);
+ layout->addWidget(searchLabel);
searchText = new KLineEdit(this, "searchText");
- tqlayout->addWidget(searchText);
+ layout->addWidget(searchText);
searchLabel->setBuddy(searchText);
findPrevButton = new TQPushButton(this, "findPrevButton");
findPrevButton->setPixmap(KGlobal::iconLoader()->loadIcon("back", KIcon::NoGroup, KIcon::SizeSmall));
TQToolTip::add(findPrevButton, i18n("Find previous"));
- tqlayout->addWidget(findPrevButton);
+ layout->addWidget(findPrevButton);
findNextButton = new TQPushButton(this, "findNextButton");
findNextButton->setPixmap(KGlobal::iconLoader()->loadIcon("forward", KIcon::NoGroup, KIcon::SizeSmall));
TQToolTip::add(findNextButton, i18n("Find next"));
- tqlayout->addWidget(findNextButton);
+ layout->addWidget(findNextButton);
caseSensitiveCheckBox = new TQCheckBox(this, "caseSensitiveCheckBox");
caseSensitiveCheckBox->setText(i18n("Case sensitive"));
- tqlayout->addWidget(caseSensitiveCheckBox);
+ layout->addWidget(caseSensitiveCheckBox);
connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch()));
diff --git a/kviewshell/searchWidget.h b/kviewshell/searchWidget.h
index 1445c22d..72e737a9 100644
--- a/kviewshell/searchWidget.h
+++ b/kviewshell/searchWidget.h
@@ -68,7 +68,7 @@ private:
TQPushButton* findPrevButton;
TQCheckBox* caseSensitiveCheckBox;
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
};
#endif
diff --git a/kviewshell/selection.cpp b/kviewshell/selection.cpp
index 50edb80f..4fb0092a 100644
--- a/kviewshell/selection.cpp
+++ b/kviewshell/selection.cpp
@@ -30,8 +30,8 @@ void TextSelection::set(const PageNumber& pageNr, TQ_INT32 start, TQ_INT32 end,
selectedText = TQString();
if (page != 0) {
- TQApplication::tqclipboard()->setSelectionMode(true);
- TQApplication::tqclipboard()->setText(selectedText);
+ TQApplication::clipboard()->setSelectionMode(true);
+ TQApplication::clipboard()->setText(selectedText);
}
}
@@ -53,8 +53,8 @@ bool TextSelection::operator!= (const TextSelection& s) const
void TextSelection::copyText() const
{
if (!isEmpty()) {
- TQApplication::tqclipboard()->setSelectionMode(false);
- TQApplication::tqclipboard()->setText(selectedText);
+ TQApplication::clipboard()->setSelectionMode(false);
+ TQApplication::clipboard()->setText(selectedText);
}
}