Browse Source

Rename obsolete tq methods to standard names

bug/2765/povray3.7
Timothy Pearson 9 years ago
parent
commit
ebbee358ab
151 changed files with 881 additions and 881 deletions
  1. +1
    -1
      kamera/kcontrol/kamera.cpp
  2. +1
    -1
      kamera/kcontrol/kameradevice.cpp
  3. +6
    -6
      kcoloredit/colorselector.cpp
  4. +4
    -4
      kcoloredit/gradientselection.cpp
  5. +2
    -2
      kcoloredit/kcoloreditdoc.cpp
  6. +5
    -5
      kcoloredit/kcoloreditview.cpp
  7. +4
    -4
      kcoloredit/paletteviewscrolledarea.cpp
  8. +3
    -3
      kcoloredit/texteditselection.cpp
  9. +1
    -1
      kcoloredit/texteditselection.h
  10. +1
    -1
      kdvi/TeXFontDefinition.h
  11. +1
    -1
      kfax/options.cpp
  12. +1
    -1
      kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
  13. +5
    -5
      kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
  14. +1
    -1
      kfile-plugins/dependencies/poppler-tqt/poppler-private.h
  15. +1
    -1
      kfile-plugins/gif/gif-info.1
  16. +1
    -1
      kfile-plugins/jpeg/kfile_jpeg.cpp
  17. +1
    -1
      kghostview/viewcontrol.cpp
  18. +8
    -8
      kiconedit/kiconconfig.cpp
  19. +1
    -1
      kiconedit/kicongrid.cpp
  20. +4
    -4
      kiconedit/kresize.cpp
  21. +6
    -6
      kiconedit/palettetoolbar.cpp
  22. +1
    -1
      kmrml/kmrml/algorithmdialog.cpp
  23. +4
    -4
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  24. +7
    -7
      kolourpaint/kpmainwindow_edit.cpp
  25. +5
    -5
      kolourpaint/kpthumbnail.cpp
  26. +1
    -1
      kolourpaint/kptool.cpp
  27. +1
    -1
      kolourpaint/pixmapfx/kpeffectbalance.cpp
  28. +7
    -7
      kolourpaint/pixmapfx/kpeffectsdialog.cpp
  29. +1
    -1
      kolourpaint/widgets/kptooltoolbar.cpp
  30. +1
    -1
      kolourpaint/widgets/kptoolwidgeterasersize.cpp
  31. +1
    -1
      kooka/CHANGES
  32. +6
    -6
      kooka/imgprintdialog.cpp
  33. +2
    -2
      kooka/kocrocrad.cpp
  34. +3
    -3
      kpdf/conf/dlgaccessibility.ui
  35. +2
    -2
      kpdf/conf/dlggeneral.ui
  36. +4
    -4
      kpdf/conf/dlgperformance.ui
  37. +1
    -1
      kpdf/conf/dlgpresentation.ui
  38. +6
    -6
      kpdf/core/generator_pdf/generator_pdf.cpp
  39. +2
    -2
      kpdf/core/page.cpp
  40. +4
    -4
      kpdf/part.cpp
  41. +4
    -4
      kpdf/ui/minibar.cpp
  42. +5
    -5
      kpdf/ui/pageview.cpp
  43. +2
    -2
      kpdf/ui/pageviewutils.cpp
  44. +1
    -1
      kpdf/ui/presentationwidget.cpp
  45. +8
    -8
      kpdf/ui/propertiesdialog.cpp
  46. +2
    -2
      kpdf/ui/searchwidget.cpp
  47. +2
    -2
      kpdf/ui/thumbnaillist.cpp
  48. +2
    -2
      kpovmodeler/pmactions.cpp
  49. +14
    -14
      kpovmodeler/pmbicubicpatchedit.cpp
  50. +4
    -4
      kpovmodeler/pmblobcylinderedit.cpp
  51. +7
    -7
      kpovmodeler/pmblobsphereedit.cpp
  52. +27
    -27
      kpovmodeler/pmcameraedit.cpp
  53. +32
    -32
      kpovmodeler/pmcolorsettings.cpp
  54. +4
    -4
      kpovmodeler/pmconeedit.cpp
  55. +5
    -5
      kpovmodeler/pmcsgedit.cpp
  56. +7
    -7
      kpovmodeler/pmcylinderedit.cpp
  57. +6
    -6
      kpovmodeler/pmdeclareedit.cpp
  58. +5
    -5
      kpovmodeler/pmdetailobjectedit.cpp
  59. +1
    -1
      kpovmodeler/pmdialogeditbase.cpp
  60. +4
    -4
      kpovmodeler/pmdialogeditbase.h
  61. +3
    -3
      kpovmodeler/pmdialogview.cpp
  62. +7
    -7
      kpovmodeler/pmdiscedit.cpp
  63. +34
    -34
      kpovmodeler/pmdockwidget.cpp
  64. +9
    -9
      kpovmodeler/pmdockwidget.h
  65. +34
    -34
      kpovmodeler/pmfinishedit.cpp
  66. +28
    -28
      kpovmodeler/pmglobalsettingsedit.cpp
  67. +1
    -1
      kpovmodeler/pmglview.h
  68. +17
    -17
      kpovmodeler/pmgridsettings.cpp
  69. +4
    -4
      kpovmodeler/pmimagemapedit.cpp
  70. +13
    -13
      kpovmodeler/pminterioredit.cpp
  71. +12
    -12
      kpovmodeler/pmlayoutsettings.cpp
  72. +5
    -5
      kpovmodeler/pmlayoutsettings.h
  73. +4
    -4
      kpovmodeler/pmlightgroupedit.cpp
  74. +4
    -4
      kpovmodeler/pmlinkedit.cpp
  75. +14
    -14
      kpovmodeler/pmlistpatternedit.cpp
  76. +8
    -8
      kpovmodeler/pmmeshedit.cpp
  77. +3
    -3
      kpovmodeler/pmnamedobjectedit.cpp
  78. +7
    -7
      kpovmodeler/pmobjectlibrarysettings.cpp
  79. +79
    -79
      kpovmodeler/pmobjectsettings.cpp
  80. +4
    -4
      kpovmodeler/pmopenglsettings.cpp
  81. +9
    -9
      kpovmodeler/pmpalettevalueedit.cpp
  82. +6
    -6
      kpovmodeler/pmpart.cpp
  83. +21
    -21
      kpovmodeler/pmpatternedit.cpp
  84. +11
    -11
      kpovmodeler/pmplaneedit.cpp
  85. +3
    -3
      kpovmodeler/pmpluginsettings.cpp
  86. +2
    -2
      kpovmodeler/pmpolynomedit.cpp
  87. +22
    -22
      kpovmodeler/pmpovraysettings.cpp
  88. +29
    -29
      kpovmodeler/pmpreviewsettings.cpp
  89. +2
    -2
      kpovmodeler/pmprismedit.cpp
  90. +3
    -3
      kpovmodeler/pmquickcoloredit.cpp
  91. +1
    -1
      kpovmodeler/pmsettingsdialog.cpp
  92. +3
    -3
      kpovmodeler/pmsolidcoloredit.cpp
  93. +8
    -8
      kpovmodeler/pmsphereedit.cpp
  94. +1
    -1
      kpovmodeler/pmtruetypecache.cpp
  95. +39
    -39
      kpovmodeler/pmvectoredit.cpp
  96. +3
    -3
      kpovmodeler/pmview.cpp
  97. +1
    -1
      kpovmodeler/pmviewbase.h
  98. +11
    -11
      kpovmodeler/pmviewlayoutmanager.cpp
  99. +14
    -14
      kpovmodeler/pmviewlayoutmanager.h
  100. +1
    -1
      ksnapshot/ksnapshot.cpp
  101. +2
    -2
      ksnapshot/ksnapshot.h
  102. +1
    -1
      ksnapshot/ksnapshotwidget.ui
  103. +1
    -1
      ksnapshot/regiongrabber.cpp
  104. +1
    -1
      ksvg/data/SVGGlyphElementImpl.lut.h
  105. +1
    -1
      ksvg/data/SVGStylableImpl.lut.h
  106. +1
    -1
      ksvg/dom/SVGSVGElement.h
  107. +2
    -2
      ksvg/ecma/ksvg_helper.cpp
  108. +3
    -3
      ksvg/impl/SVGEventImpl.cc
  109. +1
    -1
      ksvg/impl/SVGGlyphElementImpl.cc
  110. +2
    -2
      ksvg/impl/SVGStylableImpl.cc
  111. +14
    -14
      ksvg/impl/libs/libtext2path/src/Converter.cpp
  112. +3
    -3
      ksvg/impl/libs/libtext2path/src/Font.cpp
  113. +3
    -3
      ksvg/impl/libs/libtext2path/src/Glyph.cpp
  114. +2
    -2
      ksvg/impl/libs/libtext2path/src/Glyph.h
  115. +4
    -4
      kuickshow/src/defaultswidget.cpp
  116. +1
    -1
      kuickshow/src/filewidget.cpp
  117. +9
    -9
      kuickshow/src/generalwidget.cpp
  118. +1
    -1
      kuickshow/src/mainwidget.cpp
  119. +6
    -6
      kuickshow/src/printing.cpp
  120. +7
    -7
      kuickshow/src/slideshowwidget.cpp
  121. +2
    -2
      kview/config/kviewconfmodules.cpp
  122. +6
    -6
      kview/kview.cpp
  123. +2
    -2
      kview/kviewcanvas/config/confmodules.cpp
  124. +2
    -2
      kview/kviewcanvas/config/generalconfigwidget.ui
  125. +4
    -4
      kview/kviewviewer/imagesettings.cpp
  126. +6
    -6
      kview/kviewviewer/kviewviewer.cpp
  127. +3
    -3
      kview/kviewviewer/printimagesettings.ui
  128. +2
    -2
      kview/modules/presenter/config/kviewpresenterconfig.cpp
  129. +2
    -2
      kview/modules/presenter/kviewpresenterconfmodule.cpp
  130. +3
    -3
      kview/modules/scale/kview_scale.cpp
  131. +1
    -1
      kviewshell/documentPageCache.cpp
  132. +1
    -1
      kviewshell/kmultipage.cpp
  133. +1
    -1
      kviewshell/kprintDialogPage_pageoptions.cpp
  134. +3
    -3
      kviewshell/marklist.cpp
  135. +3
    -3
      kviewshell/optionDialogAccessibilityWidget.ui
  136. +2
    -2
      kviewshell/pageView.h
  137. +1
    -1
      kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
  138. +1
    -1
      kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
  139. +4
    -4
      kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
  140. +1
    -1
      kviewshell/plugins/djvu/libdjvu/DjVuImage.h
  141. +3
    -3
      kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
  142. +2
    -2
      kviewshell/plugins/djvu/libdjvu/DjVuPort.h
  143. +7
    -7
      kviewshell/searchWidget.cpp
  144. +1
    -1
      kviewshell/searchWidget.h
  145. +4
    -4
      kviewshell/selection.cpp
  146. +1
    -1
      libkscan/img_canvas.cpp
  147. +1
    -1
      libkscan/kscandoc.h
  148. +1
    -1
      libkscan/kscanslider.cpp
  149. +4
    -4
      libkscan/previewer.cpp
  150. +1
    -1
      libkscan/previewer.h
  151. +2
    -2
      libkscan/scanparams.cpp

+ 1
- 1
kamera/kcontrol/kamera.cpp View File

@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
// set the kcontrol module buttons
setButtons(Help | Apply | Cancel | Ok);
// create a tqlayout with two vertical boxes
// create a layout with two vertical boxes
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
topLayout->setAutoAdd(true);


+ 1
- 1
kamera/kcontrol/kameradevice.cpp View File

@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQWidget *page = new TQWidget( this );
setMainWidget(page);
// a tqlayout with vertical boxes
// a layout with vertical boxes
TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
// the models list


+ 6
- 6
kcoloredit/colorselector.cpp View File

@ -53,7 +53,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
topLayout->addWidget(gradientSelection, 10);
KSeparator* hLine = new KSeparator(KSeparator::HLine, this);
topLayout->addWidget(hLine);
TQHBoxLayout* tqlayout = new TQHBoxLayout();
TQHBoxLayout* layout = new TQHBoxLayout();
TextEditSelection* textEditSelection = new TextEditSelection(this);
connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) ));
@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
colorChangeLayout->addStretch(10);
colorChangeLayout->addWidget(colorChangeSliderWidget);
colorChangeLayout->addStretch(10);
tqlayout->addLayout(colorChangeLayout, 10);
layout->addLayout(colorChangeLayout, 10);
m_color.setComponents(RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE);
slotColorReplace();
KSeparator* vLine = new KSeparator(KSeparator::VLine, this);
tqlayout->addWidget(vLine);
tqlayout->addWidget(textEditSelection, 1);
layout->addWidget(vLine);
layout->addWidget(textEditSelection, 1);
colorPatch = new KColorPatch(this);
connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
colorPatch->setMinimumSize(80, 64);
tqlayout->addWidget(colorPatch, 10);
topLayout->addLayout(tqlayout);
layout->addWidget(colorPatch, 10);
topLayout->addLayout(layout);
}
ColorSelector::~ColorSelector() {
}


+ 4
- 4
kcoloredit/gradientselection.cpp View File

@ -26,13 +26,13 @@
GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
tqlayout->setMargin(3);
TQHBoxLayout* layout = new TQHBoxLayout(0);
layout->setMargin(3);
xyColorSelector = new KXYColorSelector(this);
connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
tqlayout->addWidget(xyColorSelector);
topLayout->addLayout(tqlayout, 0, 0);
layout->addWidget(xyColorSelector);
topLayout->addLayout(layout, 0, 0);
topLayout->setRowStretch(0, 10);
topLayout->setRowStretch(1, 0);
TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();


+ 2
- 2
kcoloredit/kcoloreditdoc.cpp View File

@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
TQString text;
TQTextOStream stream(&text);
palette.save(stream, 0, false);
KApplication::tqclipboard()->setText(text);
KApplication::clipboard()->setText(text);
emit clipboardChanged();
}
@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
Palette palettePaste;
TQString text;
TQTextIStream stream(&text);
text = KApplication::tqclipboard()->text();
text = KApplication::clipboard()->text();
if(palettePaste.load( stream, false )) {
m_paletteHistory.paste(paletteCursorPos(), palettePaste);
setPaletteSelection(paletteCursorPos(), paletteCursorPos() +


+ 5
- 5
kcoloredit/kcoloreditview.cpp View File

@ -43,7 +43,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea);
paletteView = new PaletteView(16, 16, 2, this, paletteViewArea);
paletteLayout->addWidget(paletteView, 10);
TQHBoxLayout* tqlayout = new TQHBoxLayout();
TQHBoxLayout* layout = new TQHBoxLayout();
TQVBoxLayout* addColorLayout = new TQVBoxLayout(4);
addColorLayout->setMargin(8);
TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4);
@ -70,7 +70,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
// paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) ));
//cursorFollowsChosenColor->toggle();
paletteView->slotCursorFollowsChosenColor(true);
tqlayout->addLayout(addColorLayout, 0);
layout->addLayout(addColorLayout, 0);
TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea);
TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame);
TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4);
@ -127,10 +127,10 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
colorAtCursorRgbStringLayout->addWidget(colorAtCursorRgbStringValueLabel);
colorAtCursorRgbStringLayout->addStretch();
colorAtCursorLayout->addLayout(colorAtCursorRgbStringLayout);
tqlayout->addWidget(colorAtCursorFrame, 10);
tqlayout->addSpacing(8);
layout->addWidget(colorAtCursorFrame, 10);
layout->addSpacing(8);
paletteLayout->addSpacing(4);
paletteLayout->addLayout(tqlayout);
paletteLayout->addLayout(layout);
paletteLayout->addSpacing(4);
inColorNameChanging = false;
doNotUpdateColorLabels = false;


+ 4
- 4
kcoloredit/paletteviewscrolledarea.cpp View File

@ -249,12 +249,12 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
int lastRow = (posY + height() - 1 + rowHeight - 1)/rowHeight;
if(viewColorNames)
painter.fillRect(0, 0, rowWidth, height(),
TQBrush( TQFrame::tqpalette().active().base() ));
TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
TQBrush( TQFrame::palette().active().base() ));
TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
TQBrush foregroundBrush;
TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
TQPen backgroundPen(TQFrame::tqpalette().active().foreground());
TQBrush cursorBrush(TQFrame::palette().active().foreground());
TQPen backgroundPen(TQFrame::palette().active().foreground());
int min = selectionMin();
int max = selectionMax();
int fontAscent = fontMetrics.ascent();


+ 3
- 3
kcoloredit/texteditselection.cpp View File

@ -59,14 +59,14 @@ TextEditSelection::~TextEditSelection(){
}
void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue,
const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
const TQString& labelString, const int row, const int column, TQGridLayout* layout) {
TQLabel* label = new TQLabel(labelString, this);
lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) ));
lineEditTable[index] = lineEdit;
lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") ));
lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") ));
tqlayout->addWidget(label, row, column*3);
tqlayout->addWidget(lineEdit, row, column*3 + 1);
layout->addWidget(label, row, column*3);
layout->addWidget(lineEdit, row, column*3 + 1);
}
void TextEditSelection::setRgbString(const int red, const int green, const int blue) {


+ 1
- 1
kcoloredit/texteditselection.h View File

@ -48,7 +48,7 @@ public slots:
protected:
/** Adds a component line edit */
void addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString,
const int row, const int column, TQGridLayout* tqlayout);
const int row, const int column, TQGridLayout* layout);
/** sets RGB string in rgbStringLineEdit */
void setRgbString(const int red, const int green, const int blue);


+ 1
- 1
kdvi/TeXFontDefinition.h View File

@ -1,6 +1,6 @@
// -*- C++ -*-
/*
* The tqlayout of a font information block.
* The layout of a font information block.
* There is one of these for every loaded font or magnification thereof.
* Duplicates are eliminated: this is necessary because of possible recursion
* in virtual fonts.


+ 1
- 1
kfax/options.cpp View File

@ -60,7 +60,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
bg->setColumnLayout( 0, Qt::Horizontal );
mainLayout->addWidget( bg );
TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());
TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
TQHBoxLayout *hbl1 = new TQHBoxLayout();


+ 1
- 1
kfile-plugins/dependencies/poppler-tqt/poppler-document.cc View File

@ -190,7 +190,7 @@ TQString Document::getInfo( const TQString & type ) const
u = s1->getChar(i) & 0xff;
++i;
}
result += tqunicodeToTQString( &u, 1 );
result += unicodeToTQString( &u, 1 );
}
obj.free();
info.free();


+ 5
- 5
kfile-plugins/dependencies/poppler-tqt/poppler-private.cc View File

@ -31,11 +31,11 @@
namespace Poppler {
/* borrowed from kpdf */
TQString tqunicodeToTQString(Unicode* u, int len)
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;
@ -69,7 +69,7 @@ TQString UnicodeParsedString(GooString *s1)
u = s1->getChar(i) & 0xff;
++i;
}
result += tqunicodeToTQString( &u, 1 );
result += unicodeToTQString( &u, 1 );
}
return result;
}
@ -79,7 +79,7 @@ GooString *TQStringToGooString(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();
GooString *ret = new GooString(cstring, len);
gfree(cstring);
return ret;
@ -98,7 +98,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
TQString name;
Unicode * uniChar = outlineItem->getTitle();
int titleLength = outlineItem->getTitleLength();
name = tqunicodeToTQString(uniChar, titleLength);
name = unicodeToTQString(uniChar, titleLength);
if ( name.isEmpty() )
continue;


+ 1
- 1
kfile-plugins/dependencies/poppler-tqt/poppler-private.h View File

@ -39,7 +39,7 @@ namespace Poppler {
class DocumentData;
TQString tqunicodeToTQString(Unicode* u, int len);
TQString unicodeToTQString(Unicode* u, int len);
TQString UnicodeParsedString(GooString *s1);


+ 1
- 1
kfile-plugins/gif/gif-info.1 View File

@ -15,7 +15,7 @@ displays information about the given gif (Graphic Interchange Format) image. If
.PP
Write a empty comment ('') to delete the comment block.
.PP
The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block. The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored. You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 tqunicode format.
The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block. The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored. You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 unicode format.
.SH "SEE ALSO"
.BR wrjpgcom (1)


+ 1
- 1
kfile-plugins/jpeg/kfile_jpeg.cpp View File

@ -178,7 +178,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const
*/
/*
The jpeg standard does not regulate the contents of the COM block.
I'm assuming the best thing to do here is write as tqunicode utf-8,
I'm assuming the best thing to do here is write as unicode utf-8,
which is fully backwards compatible with readers expecting ascii.
Readers expecting a national character set are out of luck...
*/


+ 1
- 1
kghostview/viewcontrol.cpp View File

@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
bbox->tqlayout();
bbox->layout();
topLayout->addWidget( bbox );
topLayout->activate();


+ 8
- 8
kiconedit/kiconconfig.cpp View File

@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
grp->setColumnLayout(0, Qt::Vertical);
grp->tqlayout()->setSpacing(spacingHint());
grp->tqlayout()->setMargin(marginHint());
TQGridLayout *l = new TQGridLayout(grp->tqlayout());
grp->layout()->setSpacing(spacingHint());
grp->layout()->setMargin(marginHint());
TQGridLayout *l = new TQGridLayout(grp->layout());
ln_name = new TQLineEdit( grp );
connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ),
@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
TQVBoxLayout* ml = new TQVBoxLayout( this );
ml->addWidget( grp );
TQVBoxLayout* l = new TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() );
TQVBoxLayout* l = new TQVBoxLayout( grp->layout(), KDialog::spacingHint() );
l->addWidget( templates );
for( unsigned int i = 0; i < KIconTemplateContainer::self()->count(); i++ )
@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
bbox->addStretch( 1 );
bbox->tqlayout();
bbox->layout();
l->addWidget( bbox );
}
@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
grp1->setColumnLayout(0, Qt::Vertical );
grp1->tqlayout()->setSpacing( KDialog::spacingHint() );
grp1->tqlayout()->setMargin( KDialog::marginHint() );
grp1->layout()->setSpacing( KDialog::spacingHint() );
grp1->layout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 );
TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 );
TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
btngrp->setExclusive( true );


+ 1
- 1
kiconedit/kicongrid.cpp View File

@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok)
{
TQCString format = fileFormats.current();
TQCString type = "image/" + format.lower();
if (kapp->tqclipboard()->data()->provides(type ) )
if (kapp->clipboard()->data()->provides(type ) )
{
oneIsSupported = true;
}


+ 4
- 4
kiconedit/kresize.cpp View File

@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
group->setColumnLayout( 0, Qt::Horizontal );
genLayout->addWidget( group );
TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 );
TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group );
m_width->setValue( size.width() );
tqlayout->addWidget( m_width, 1 );
layout->addWidget( m_width, 1 );
TQLabel* label = new TQLabel( "X", group );
tqlayout->addWidget( label );
layout->addWidget( label );
m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group);
m_height->setValue( size.height() );
tqlayout->addWidget( m_height, 1 );
layout->addWidget( m_height, 1 );
setMinimumSize( 200, 100 );
}


+ 6
- 6
kiconedit/palettetoolbar.cpp View File

@ -54,27 +54,27 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
m_layout->addWidget( m_currentColorView );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 );
TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 );
TQLabel *l = new TQLabel( i18n( "System colors:" ), base );
vtqlayout->addWidget( l );
vlayout->addWidget( l );
m_sysColors = new KSysColors( base );
TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select"
" colors from the KDE icon palette" ) );
vtqlayout->addWidget( m_sysColors );
vlayout->addWidget( m_sysColors );
connect( m_sysColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );
vtqlayout = new TQVBoxLayout( m_layout, 0 );
vlayout = new TQVBoxLayout( m_layout, 0 );
l = new TQLabel( i18n( "Custom colors:" ), base );
vtqlayout->addWidget( l );
vlayout->addWidget( l );
m_customColors = new KCustomColors( base );
TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can"
" build a palette of custom colors.\nDouble-click on a box to edit"
" the color" ) );
vtqlayout->addWidget( m_customColors );
vlayout->addWidget( m_customColors );
connect( m_customColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );


+ 1
- 1
kmrml/kmrml/algorithmdialog.cpp View File

@ -71,7 +71,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(),
"mainLayout");
TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll tqlayout");
TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout");
collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box ));
m_collectionCombo = new CollectionCombo( box, "collection combo" );


+ 4
- 4
kmrml/kmrml/kcontrol/kcmkmrml.cpp View File

@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
setAboutData( ab );
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
tqlayout->setSpacing( KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this );
layout->setSpacing( KDialog::spacingHint() );
m_mainPage = new MainPage( this, "main page" );
tqlayout->addWidget( m_mainPage );
layout->addWidget( m_mainPage );
connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool )));
@ -90,7 +90,7 @@ void KCMKMrml::checkGiftInstallation()
KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this );
urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
TQLayout *l = tqlayout();
TQLayout *l = layout();
l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
l->add( errorLabel );
l->add( urlLabel );


+ 7
- 7
kolourpaint/kpmainwindow_edit.cpp View File

@ -129,7 +129,7 @@ void kpMainWindow::setupEditMenuActions ()
// Paste should always be enabled, as long as there is something paste
// (independent of whether we have a document or not)
connect (TQApplication::tqclipboard (), TQT_SIGNAL (dataChanged ()),
connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ()));
slotEnablePaste ();
}
@ -223,7 +223,7 @@ void kpMainWindow::slotCopy ()
{
if (!sel.text ().isEmpty ())
{
TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
TQClipboard::Clipboard);
// SYNC: Normally, users highlight text and press CTRL+C.
@ -243,7 +243,7 @@ void kpMainWindow::slotCopy ()
// Once we change KolourPaint to support highlighted text
// and CTRL+C to copy only the highlighted text, delete
// this code.
TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
TQClipboard::Selection);
}
}
@ -268,7 +268,7 @@ void kpMainWindow::slotCopy ()
rawPixmap,
TQt::white)); // CONFIG
TQApplication::tqclipboard ()->setData (new kpSelectionDrag (sel),
TQApplication::clipboard ()->setData (new kpSelectionDrag (sel),
TQClipboard::Clipboard);
}
@ -288,7 +288,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
bool hasSomething = false;
TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
if (ms)
{
// It's faster to test for TQTextDrag::canDecode() first due to the
@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
return hasSomething;
}
// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqtqclipboard() to
// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to
// emit dataChanged(). We don't want to have our paste
// action disabled when we can actually paste something.
//
@ -683,7 +683,7 @@ void kpMainWindow::slotPaste ()
// Acquire the pixmap
//
TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
if (!ms)
{
kdError () << "kpMainWindow::slotPaste() without mimeSource" << endl;


+ 5
- 5
kolourpaint/kpthumbnail.cpp View File

@ -63,16 +63,16 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
}
TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize ();
TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize ();
#if DEBUG_KP_THUMBNAIL
kdDebug () << "\ttqlayout=" << tqlayout ()
<< " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl;
kdDebug () << "\tlayout=" << layout ()
<< " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl;
kdDebug () << "\tboxLayout=" << boxLayout ()
<< " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
<< endl;
#endif
if (tqlayout ())
tqlayout ()->setResizeMode (TQLayout::FreeResize);
if (layout ())
layout ()->setResizeMode (TQLayout::FreeResize);
setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
TQMAX (layoutMinimumSize.height (), 64));


+ 1
- 1
kolourpaint/kptool.cpp View File

@ -944,7 +944,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
if (m_mainWindow && e->button () == Qt::MidButton)
{
const TQString text = TQApplication::tqclipboard ()->text (TQClipboard::Selection);
const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
#if DEBUG_KP_TOOL && 1
kdDebug () << "\tMMB pasteText='" << text << "'" << endl;
#endif


+ 1
- 1
kolourpaint/pixmapfx/kpeffectbalance.cpp View File

@ -275,7 +275,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
// TODO: This is what should be shown in the m_gammaInput spinbox
m_gammaLabel = new TQLabel (this);
// TODO: This doesn't seem to be wide enough with some fonts so the
// whole tqlayout moves when we drag the gamma slider.
// whole layout moves when we drag the gamma slider.
m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);


+ 7
- 7
kolourpaint/pixmapfx/kpeffectsdialog.cpp View File

@ -258,20 +258,20 @@ void kpEffectsDialog::selectEffect (int which)
TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
TQLayout::ResizeMode previewGroupBoxResizeMode =
m_previewGroupBox->tqlayout () ?
m_previewGroupBox->tqlayout ()->resizeMode () :
m_previewGroupBox->layout () ?
m_previewGroupBox->layout ()->resizeMode () :
TQLayout::Auto;
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
<< " maxSize=" << previewGroupBoxMaxSize
<< " size=" << m_previewGroupBox->size ()
<< " tqlayout=" << m_previewGroupBox->tqlayout ()
<< " layout=" << m_previewGroupBox->layout ()
<< " resizeMode=" << previewGroupBoxResizeMode
<< endl;
#endif
if (m_previewGroupBox->tqlayout ())
m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize);
if (m_previewGroupBox->layout ())
m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter set resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which)
kdDebug () << "\tafter set fixedSize, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
#endif
if (m_previewGroupBox->tqlayout ())
m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode);
if (m_previewGroupBox->layout ())
m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter restore resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;


+ 1
- 1
kolourpaint/widgets/kptooltoolbar.cpp View File

@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
setOrientation (orientation ());
#if DEBUG_KP_TOOL_TOOL_BAR
kdDebug () << "kpToolToolBar::<ctor> tqlayout tool widgets msec="
kdDebug () << "kpToolToolBar::<ctor> layout tool widgets msec="
<< timer.elapsed () << endl;
#endif


+ 1
- 1
kolourpaint/widgets/kptoolwidgeterasersize.cpp View File

@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na
TQPixmap previewPixmap (s, s);
if (i < 3)
{
// HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing
// HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing
previewPixmap.resize ((width () - 4) / 3, 9);
}


+ 1
- 1
kooka/CHANGES View File

@ -20,7 +20,7 @@ scanned with about 150 dpi.
via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig.
OCR may be performed on the entire image or the selection.
* Reworked the save assistant: New tqlayout and fully KDE2-Compliant.
* Reworked the save assistant: New layout and fully KDE2-Compliant.
Still no new Image format help texts.
* Reworked the startup dialog: Allows to select the scan device from a


+ 6
- 6
kooka/imgprintdialog.cpp View File

@ -53,9 +53,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
m_ignoreSignal(false)
{
setTitle(i18n("Image Printing"));
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
// tqlayout->setMargin( KDialog::marginHint() );
// tqlayout->setSpacing( KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this );
// layout->setMargin( KDialog::marginHint() );
// layout->setSpacing( KDialog::spacingHint() );
m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this );
m_scaleRadios->setRadioButtonExclusive(true);
@ -84,11 +84,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
TQToolTip::add( m_rbFitPage, i18n("Printout uses maximum space on the selected pager. Aspect ratio is maintained."));
m_scaleRadios->insert( m_rbFitPage, ID_FIT_PAGE );
tqlayout->addWidget( m_scaleRadios );
layout->addWidget( m_scaleRadios );
TQHBoxLayout *hbox = new TQHBoxLayout( this );
tqlayout->addLayout( hbox );
layout->addLayout( hbox );
/** Box for Image Resolutions **/
TQVGroupBox *group1 = new TQVGroupBox( i18n("Resolutions"), this );
@ -128,7 +128,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
TQWidget *spaceEater = new TQWidget( this );
spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
tqlayout->addWidget( spaceEater );
layout->addWidget( spaceEater );
/* Set start values */
m_rbScreen->setChecked(true);


+ 2
- 2
kooka/kocrocrad.cpp View File

@ -129,7 +129,7 @@ EngineError ocradDialog::setupGui()
else
m_ocrCmd = res;
/** tqlayout detection button **/
/** layout detection button **/
conf->setGroup( CFG_GROUP_OCRAD );
int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
@ -137,7 +137,7 @@ EngineError ocradDialog::setupGui()
(void) new KSeparator( KSeparator::HLine, page);
TQHBox *hb1 = new TQHBox(page);
hb1->setSpacing( KDialog::spacingHint() );
(void) new TQLabel( i18n("OCRAD tqlayout analysis mode: "), hb1);
(void) new TQLabel( i18n("OCRAD layout analysis mode: "), hb1);
m_layoutMode = new TQComboBox(hb1);
m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
m_layoutMode->insertItem(i18n("Column Detection"), 1 );


+ 3
- 3
kpdf/conf/dlgaccessibility.ui View File

@ -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">


+ 2
- 2
kpdf/conf/dlggeneral.ui View File

@ -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">


+ 4
- 4
kpdf/conf/dlgperformance.ui View File

@ -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">


+ 1
- 1
kpdf/conf/dlgpresentation.ui View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<grid>
<property name="name">


+ 6
- 6
kpdf/core/generator_pdf/generator_pdf.cpp View File

@ -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 );


+ 2
- 2
kpdf/core/page.cpp View File

@ -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;


+ 4
- 4
kpdf/part.cpp View File

@ -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 );


+ 4
- 4
kpdf/ui/minibar.cpp View File

@ -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 );
}
}


+ 5
- 5
kpdf/ui/pageview.cpp View File

@ -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


+ 2
- 2
kpdf/ui/pageviewutils.cpp View File

@ -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 );


+ 1
- 1
kpdf/ui/presentationwidget.cpp View File

@ -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 );


+ 8
- 8
kpdf/ui/propertiesdialog.cpp View File

@ -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 );


+ 2
- 2
kpdf/ui/searchwidget.cpp View File

@ -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);
}


+ 2
- 2
kpdf/ui/thumbnaillist.cpp View File

@ -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 )
{


+ 2
- 2
kpovmodeler/pmactions.cpp View File

@ -135,10 +135,10 @@ protected:
void drawButton( TQPainter* p )
{
// Draw the background
tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
style( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
// Draw the label
tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
style( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
TQStyle::Style_Enabled );
}
};


+ 14
- 14
kpovmodeler/pmbicubicpatchedit.cpp View File

@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( )
{
Base::createTopWidgets( );
TQHBoxLayout* tqlayout;