summaryrefslogtreecommitdiffstats
path: root/kpdf
diff options
context:
space:
mode:
Diffstat (limited to 'kpdf')
-rw-r--r--kpdf/conf/dlgaccessibility.ui6
-rw-r--r--kpdf/conf/dlggeneral.ui4
-rw-r--r--kpdf/conf/dlgperformance.ui8
-rw-r--r--kpdf/conf/dlgpresentation.ui2
-rw-r--r--kpdf/core/generator_pdf/generator_pdf.cpp12
-rw-r--r--kpdf/core/page.cpp4
-rw-r--r--kpdf/part.cpp8
-rw-r--r--kpdf/ui/minibar.cpp8
-rw-r--r--kpdf/ui/pageview.cpp10
-rw-r--r--kpdf/ui/pageviewutils.cpp4
-rw-r--r--kpdf/ui/presentationwidget.cpp2
-rw-r--r--kpdf/ui/propertiesdialog.cpp16
-rw-r--r--kpdf/ui/searchwidget.cpp4
-rw-r--r--kpdf/ui/thumbnaillist.cpp4
14 files changed, 46 insertions, 46 deletions
diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui
index 113a3671..9bb5d46e 100644
--- a/kpdf/conf/dlgaccessibility.ui
+++ b/kpdf/conf/dlgaccessibility.ui
@@ -138,7 +138,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -215,7 +215,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -348,7 +348,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui
index 517db931..430f3dfb 100644
--- a/kpdf/conf/dlggeneral.ui
+++ b/kpdf/conf/dlggeneral.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index 994e05ff..3676c3ba 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -66,7 +66,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6_2</cstring>
+ <cstring>layout6_2</cstring>
</property>
<vbox>
<property name="name">
@@ -144,7 +144,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -178,7 +178,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index a7bb5c28..d011c2b3 100644
--- a/kpdf/conf/dlgpresentation.ui
+++ b/kpdf/conf/dlgpresentation.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 02ce1148..65e3a55a 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -457,7 +457,7 @@ bool PDFGenerator::print( KPrinter& printer )
{
pstitle = m_document->currentDocument().fileName( false );
}
- // this looks non-tqunicode-safe and it is. anything other than ASCII is not specified
+ // this looks non-unicode-safe and it is. anything other than ASCII is not specified
// and some printers actually stop printing when they encounter non-ASCII characters in the
// Postscript %%Title tag
TQCString pstitle8Bit = pstitle.latin1();
@@ -528,14 +528,14 @@ static GString *TQStringToGString(const TQString &s) {
int len = s.length();
char *cstring = (char *)gmallocn(s.length(), sizeof(char));
for (int i = 0; i < len; ++i)
- cstring[i] = s.at(i).tqunicode();
+ cstring[i] = s.at(i).unicode();
return new GString(cstring, len);
}
-static TQString tqunicodeToTQString(Unicode* u, int len) {
+static TQString unicodeToTQString(Unicode* u, int len) {
TQString ret;
ret.setLength(len);
- TQChar* qch = (TQChar*) ret.tqunicode();
+ TQChar* qch = (TQChar*) ret.unicode();
for (;len;--len)
*qch++ = (TQChar) *u++;
return ret;
@@ -568,7 +568,7 @@ static TQString UnicodeParsedString(GString *s1) {
u = s1->getChar(i) & 0xff;
++i;
}
- result += tqunicodeToTQString( &u, 1 );
+ result += unicodeToTQString( &u, 1 );
}
return result;
}
@@ -868,7 +868,7 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
TQString name;
Unicode * uniChar = outlineItem->getTitle();
int titleLength = outlineItem->getTitleLength();
- name = tqunicodeToTQString(uniChar, titleLength);
+ name = unicodeToTQString(uniChar, titleLength);
if ( name.isEmpty() )
continue;
TQDomElement item = docSyn.createElement( name );
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 0014d26a..cadaacf3 100644
--- a/kpdf/core/page.cpp
+++ b/kpdf/core/page.cpp
@@ -131,11 +131,11 @@ NormalizedRect * KPDFPage::findText( const TQString & text, bool strictCase, Nor
return 0;
// create a xpf's Unicode (unsigned int) array for the given text
- const TQChar * str = text.tqunicode();
+ const TQChar * str = text.unicode();
int len = text.length();
TQMemArray<Unicode> u(len);
for (int i = 0; i < len; ++i)
- u[i] = str[i].tqunicode();
+ u[i] = str[i].unicode();
// find out the direction of search
enum SearchDir { FromTop, NextMatch, PrevMatch } dir = lastRect ? NextMatch : FromTop;
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 2638e718..1ceb042d 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -80,12 +80,12 @@ class PDFOptionsPage : public KPrintDialogPage
PDFOptionsPage()
{
setTitle( i18n( "PDF Options" ) );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_forceRaster = new TQCheckBox(i18n("Force rasterization"), this);
TQToolTip::add(m_forceRaster, i18n("Rasterize into an image before printing"));
TQWhatsThis::add(m_forceRaster, i18n("Forces the rasterization of each page into an image before printing it. This usually gives somewhat worse results, but is useful when printing documents that appear to print incorrectly."));
- tqlayout->addWidget(m_forceRaster);
- tqlayout->addStretch(1);
+ layout->addWidget(m_forceRaster);
+ layout->addStretch(1);
}
void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false )
@@ -186,7 +186,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
int index;
// [left toolbox: Table of Contents] | []
- // dummy wrapper with tqlayout to enable horizontal scroll bars (bug: 147233)
+ // dummy wrapper with layout to enable horizontal scroll bars (bug: 147233)
TQWidget *tocWrapper = new TQWidget(m_toolBox);
TQVBoxLayout *tocWrapperLayout = new TQVBoxLayout(tocWrapper);
m_tocFrame = new TOC( tocWrapper, m_document );
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index 864291c5..baa449af 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -87,7 +87,7 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
TQSpacerItem * spacerL = new TQSpacerItem( 20, 10, TQSizePolicy::Expanding );
horLayout->addItem( spacerL );
- // central 2r by 3c grid tqlayout that contains all components
+ // central 2r by 3c grid layout that contains all components
TQGridLayout * gridLayout = new TQGridLayout( 0, 3,5, 2,1 );
// top spacer 6x6 px
// TQSpacerItem * spacerTop = new TQSpacerItem( 6, 6, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
@@ -318,7 +318,7 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
p.drawLine( delta, 0, delta, h );
}
// draw a frame-like outline
- //p.setPen( tqpalette().active().mid() );
+ //p.setPen( palette().active().mid() );
//p.drawRect( 0,0, w, h );
}
@@ -372,7 +372,7 @@ void PagesEdit::focusOutEvent( TQFocusEvent * e )
{
// change background color to a dark tone
setLineWidth( 1 );
- setPaletteBackgroundColor( tqpalette().active().background().light( 105 ) );
+ setPaletteBackgroundColor( palette().active().background().light( 105 ) );
// restore text
TQLineEdit::setText( backString );
// call default handler
@@ -428,7 +428,7 @@ void HoverButton::paintEvent( TQPaintEvent * e )
else
{
TQPainter p( this );
- p.fillRect(e->rect(), parentWidget() ? parentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
+ p.fillRect(e->rect(), parentWidget() ? parentWidget()->palette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
drawButtonLabel( &p );
}
}
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index b0b9da30..cf93db68 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -68,7 +68,7 @@ public:
TQValueVector< PageViewItem * > items;
TQValueList< PageViewItem * > visibleItems;
- // view tqlayout (columns and continuous in Settings), zoom and mouse
+ // view layout (columns and continuous in Settings), zoom and mouse
PageView::ZoomMode zoomMode;
float zoomFactor;
int rotation;
@@ -392,7 +392,7 @@ void PageView::notifyViewportChanged( bool smoothMove )
return;
}
- // retqlayout in "Single Pages" mode or if a retqlayout is pending
+ // relayout in "Single Pages" mode or if a relayout is pending
d->blockPixmapsRequest = true;
if ( !KpdfSettings::viewContinuous() || d->dirtyLayout )
slotRelayoutPages();
@@ -1147,7 +1147,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( choice == 3 )
{
// [2] copy pixmap to clipboard
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( copyPix, TQClipboard::Clipboard );
if ( cb->supportsSelection() )
cb->setPixmap( copyPix, TQClipboard::Selection );
@@ -1175,7 +1175,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if ( choice == 1 )
{
// [1] copy text to clipboard
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText( selectedText, TQClipboard::Clipboard );
if ( cb->supportsSelection() )
cb->setText( selectedText, TQClipboard::Selection );
@@ -1544,7 +1544,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
if ( newZoomMode != d->zoomMode || (newZoomMode == ZoomFixed && newFactor != d->zoomFactor ) )
{
- // rebuild tqlayout and update the whole viewport
+ // rebuild layout and update the whole viewport
d->zoomMode = newZoomMode;
d->zoomFactor = newFactor;
// be sure to block updates to document's viewport
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index 27565753..ce657882 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -27,7 +27,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent )
setFocusPolicy( TQ_NoFocus );
setBackgroundMode( NoBackground );
setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
- // if the tqlayout is LtR, we can safely place it in the right position
+ // if the layout is LtR, we can safely place it in the right position
if ( !TQApplication::reverseLayout() )
move( 10, 10 );
resize( 0, 0 );
@@ -116,7 +116,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
bufferPainter.setPen( foregroundColor() );
bufferPainter.drawText( 5 + textXOffset, yText, message );
- // if the tqlayout is RtL, we can move it to the right place only after we
+ // if the layout is RtL, we can move it to the right place only after we
// know how much size it will take
if ( TQApplication::reverseLayout() )
move( parentWidget()->width() - geometry.width() - 10, 10 );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 12ebe96d..ada517d9 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -314,7 +314,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
m_topBar->alignItemRight( 1 );
m_topBar->hide();
// change topbar background color
- TQPalette p = m_topBar->tqpalette();
+ TQPalette p = m_topBar->palette();
p.setColor( TQPalette::Active, TQColorGroup::Button, TQt::gray );
p.setColor( TQPalette::Active, TQColorGroup::Background, TQt::darkGray );
m_topBar->setPalette( p );
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 06521692..718a0635 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -24,12 +24,12 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
{
// Properties
TQFrame *page = addPage(i18n("Properties"));
- TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
// get document info, if not present display blank data and a warning
const DocumentInfo * info = doc->documentInfo();
if ( !info ) {
- tqlayout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
+ layout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
return;
}
@@ -49,11 +49,11 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
if ( titleString.isEmpty() || valueString.isEmpty() )
continue;
- // create labels and tqlayout them
+ // create labels and layout them
TQLabel *key = new TQLabel( i18n( "%1:" ).arg( titleString ), page );
TQLabel *value = new KSqueezedTextLabel( valueString, page );
- tqlayout->addWidget( key, row, 0, AlignRight );
- tqlayout->addWidget( value, row, 1 );
+ layout->addWidget( key, row, 0, AlignRight );
+ layout->addWidget( value, row, 1 );
row++;
// refine maximum width of 'value' labels
@@ -66,8 +66,8 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
TQLabel *key = new TQLabel( i18n( "Pages:" ), page );
TQLabel *value = new TQLabel( TQString::number( doc->pages() ), page );
- tqlayout->addWidget( key, row, 0 );
- tqlayout->addWidget( value, row, 1 );
+ layout->addWidget( key, row, 0 );
+ layout->addWidget( value, row, 1 );
}
// Fonts
@@ -82,7 +82,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
}
// current width: left column + right column + dialog borders
- int width = tqlayout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
+ int width = layout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
if (page2Layout)
{
width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 7ca3ba49..f21d8b73 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -79,10 +79,10 @@ void SearchWidget::clearText()
void SearchWidget::slotTextChanged( const TQString & text )
{
// if 0<length<3 set 'red' text and send a blank string to document
- TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : tqpalette().active().text();
+ TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : palette().active().text();
KLineEdit * lineEdit = getLined( LEDIT_ID );
lineEdit->setPaletteForegroundColor( color );
- lineEdit->setPaletteBackgroundColor( tqpalette().active().base() );
+ lineEdit->setPaletteBackgroundColor( palette().active().base() );
m_inputDelayTimer->stop();
m_inputDelayTimer->start(333, true);
}
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 8f9359b5..22819cb6 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -82,7 +82,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
setDragAutoScroll( false );
// set contents background to the 'base' color
- viewport()->setPaletteBackgroundColor( tqpalette().active().base() );
+ viewport()->setPaletteBackgroundColor( palette().active().base() );
setFrameStyle( StyledPanel | Raised );
connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
@@ -509,7 +509,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
p.setPen( isBookmarked ? TQColor( 0xFF8000 ) : TQt::black );
p.drawRect( m_margin/2 - 1, m_margin/2 - 1, m_pixmapWidth + 2, m_pixmapHeight + 2 );
// draw the clear rect
- p.setPen( isBookmarked ? TQColor( 0x804000 ) : tqpalette().active().base() );
+ p.setPen( isBookmarked ? TQColor( 0x804000 ) : palette().active().base() );
// draw the bottom and right shadow edges
if ( !isBookmarked )
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 21:44:55 +0000