Browse Source

Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit c2637a0da6.
tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
ec1fddcd0d
100 changed files with 426 additions and 426 deletions
  1. +3
    -3
      kamera/kcontrol/kamera.cpp
  2. +3
    -3
      kamera/kcontrol/kameraconfigdialog.cpp
  3. +7
    -7
      kamera/kcontrol/kameradevice.cpp
  4. +6
    -6
      kamera/kioslave/kamera.cpp
  5. +7
    -7
      kcoloredit/colorselector.cpp
  6. +5
    -5
      kcoloredit/gradientselection.cpp
  7. +1
    -1
      kcoloredit/kcoloredit.h
  8. +3
    -3
      kcoloredit/kcoloreditdoc.cpp
  9. +6
    -6
      kcoloredit/kcoloreditview.cpp
  10. +1
    -1
      kcoloredit/kxycolorselector.cpp
  11. +1
    -1
      kcoloredit/kzcolorselector.cpp
  12. +1
    -1
      kcoloredit/loadpalettedlg.cpp
  13. +1
    -1
      kcoloredit/palette.cpp
  14. +1
    -1
      kcoloredit/palette.h
  15. +1
    -1
      kcoloredit/paletteview.cpp
  16. +8
    -8
      kcoloredit/paletteviewscrolledarea.cpp
  17. +3
    -3
      kcoloredit/texteditselection.cpp
  18. +2
    -2
      kcoloredit/texteditselection.h
  19. +3
    -3
      kdvi/TeXFontDefinition.cpp
  20. +1
    -1
      kdvi/TeXFontDefinition.h
  21. +10
    -10
      kdvi/TeXFont_PFB.cpp
  22. +8
    -8
      kdvi/TeXFont_PK.cpp
  23. +1
    -1
      kdvi/dviFile.cpp
  24. +11
    -11
      kdvi/dviRenderer.cpp
  25. +2
    -2
      kdvi/dviRenderer_draw.cpp
  26. +9
    -9
      kdvi/dviRenderer_export.cpp
  27. +25
    -25
      kdvi/dviRenderer_prescan.cpp
  28. +1
    -1
      kdvi/dviWidget.cpp
  29. +2
    -2
      kdvi/fontEncoding.cpp
  30. +1
    -1
      kdvi/fontEncoding.h
  31. +1
    -1
      kdvi/fontMap.cpp
  32. +1
    -1
      kdvi/fontMap.h
  33. +21
    -21
      kdvi/fontpool.cpp
  34. +3
    -3
      kdvi/fontprogress.cpp
  35. +7
    -7
      kdvi/infodialog.cpp
  36. +3
    -3
      kdvi/kdvi_multipage.cpp
  37. +2
    -2
      kdvi/main.cpp
  38. +1
    -1
      kdvi/optionDialogFontsWidget_base.ui
  39. +2
    -2
      kdvi/optionDialogSpecialWidget_base.ui
  40. +7
    -7
      kdvi/psgs.cpp
  41. +9
    -9
      kdvi/special.cpp
  42. +1
    -1
      kdvi/vf.cpp
  43. +6
    -6
      kfax/faxinput.cpp
  44. +8
    -8
      kfax/kfax.cpp
  45. +1
    -1
      kfax/kfax_printsettings.cpp
  46. +7
    -7
      kfax/options.cpp
  47. +3
    -3
      kfaxview/faxrenderer.cpp
  48. +3
    -3
      kfaxview/libkfaximage/kfaximage.cpp
  49. +2
    -2
      kfaxview/main.cpp
  50. +1
    -1
      kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
  51. +1
    -1
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
  52. +2
    -2
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
  53. +9
    -9
      kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
  54. +1
    -1
      kfile-plugins/dependencies/poppler-tqt/poppler-private.h
  55. +7
    -7
      kfile-plugins/exr/kfile_exr.cpp
  56. +1
    -1
      kfile-plugins/gif/gif-info.1
  57. +6
    -6
      kfile-plugins/jpeg/exif.cpp
  58. +1
    -1
      kfile-plugins/jpeg/kfile_jpeg.cpp
  59. +5
    -5
      kfile-plugins/pdf/kfile_pdf.cpp
  60. +1
    -1
      kfile-plugins/pnm/kfile_pnm.cpp
  61. +1
    -1
      kfile-plugins/ps/gscreator.cpp
  62. +2
    -2
      kfile-plugins/rgb/kfile_rgb.cpp
  63. +1
    -1
      kgamma/kcmkgamma/displaynumber.cpp
  64. +12
    -12
      kgamma/kcmkgamma/kgamma.cpp
  65. +5
    -5
      kghostview/displayoptions.cpp
  66. +1
    -1
      kghostview/gssettingswidget.ui
  67. +1
    -1
      kghostview/gssettingswidget.ui.h
  68. +2
    -2
      kghostview/infodialog.cpp
  69. +3
    -3
      kghostview/kdscerrordialog.cpp
  70. +7
    -7
      kghostview/kgv_miniwidget.cpp
  71. +5
    -5
      kghostview/kgv_view.cpp
  72. +6
    -6
      kghostview/kgvconfigdialog.cpp
  73. +18
    -18
      kghostview/kgvdocument.cpp
  74. +1
    -1
      kghostview/kgvfactory.cpp
  75. +1
    -1
      kghostview/kgvpagedecorator.cpp
  76. +3
    -3
      kghostview/kgvshell.cpp
  77. +3
    -3
      kghostview/kpswidget.cpp
  78. +1
    -1
      kghostview/logwindow.cpp
  79. +2
    -2
      kghostview/marklist.cpp
  80. +3
    -3
      kghostview/scrollbox.cpp
  81. +17
    -17
      kghostview/viewcontrol.cpp
  82. +4
    -4
      kiconedit/kcolorgrid.cpp
  83. +1
    -1
      kiconedit/kcolorgrid.h
  84. +5
    -5
      kiconedit/kicon.cpp
  85. +1
    -1
      kiconedit/kiconcolors.cpp
  86. +12
    -12
      kiconedit/kiconconfig.cpp
  87. +3
    -3
      kiconedit/kiconedit.cpp
  88. +1
    -1
      kiconedit/kiconedit.h
  89. +5
    -5
      kiconedit/kiconeditslots.cpp
  90. +5
    -5
      kiconedit/kicongrid.cpp
  91. +2
    -2
      kiconedit/knew.cpp
  92. +5
    -5
      kiconedit/kresize.cpp
  93. +9
    -9
      kiconedit/palettetoolbar.cpp
  94. +5
    -5
      kmrml/kmrml/algorithmdialog.cpp
  95. +1
    -1
      kmrml/kmrml/kcontrol/indexcleaner.cpp
  96. +2
    -2
      kmrml/kmrml/kcontrol/indexer.cpp
  97. +7
    -7
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  98. +2
    -2
      kmrml/kmrml/kcontrol/mainpage.cpp
  99. +2
    -2
      kmrml/kmrml/kcontrol/serverconfigwidget.ui
  100. +2
    -2
      kmrml/kmrml/lib/kmrml_config.cpp

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

@@ -21,7 +21,7 @@

*/
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>

#include <kgenericfactory.h>
#include <ksimpleconfig.h>
@@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
// set the kcontrol module buttons
setButtons(Help | Apply | Cancel | Ok);

// create a layout with two vertical boxes
// create a tqlayout with two vertical boxes
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
topLayout->setAutoAdd(true);
@@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));

m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
// create actions
KAction *act;


+ 3
- 3
kamera/kcontrol/kameraconfigdialog.cpp View File

@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

*/
#include <layout.h>
#include <tqlayout.h>
#include <tqgrid.h>
#include <tqlabel.h>
#include <tqvgroupbox.h>
@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
return;
}

// Append all this widgets children
// Append all this widgets tqchildren
for(int i = 0; i < gp_widget_count_children(widget); ++i) {
CameraWidget *widget_child;
gp_widget_get_child(widget, i, &widget_child);
appendWidget(newParent, widget_child);
}
// Things that must be done after all children were added
// Things that must be done after all tqchildren were added
/*
switch (widget_type) {
case GP_WIDGET_SECTION:


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

@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

*/
#include <layout.h>
#include <tqlayout.h>
#include <tqwidgetstack.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
@@ -86,7 +86,7 @@ bool KCamera::initInformation()
int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
if(index < 0) {
emit error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").arg(m_model));
" Configuration options may be incorrect.").tqarg(m_model));
return false;
}
gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
TQWidget *page = new TQWidget( this );
setMainWidget(page);

// a layout with vertical boxes
// a tqlayout with vertical boxes
TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());

// the models list
@@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
TQT_SLOT(slot_setModel(TQListViewItem *)));
// make sure listview only as wide as it needs to be
m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
TQSizePolicy::Preferred));

TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
for (int i = 0; i < gphoto_ports; i++) {
if (gp_port_info_list_get_info(list, i, &info) >= 0) {
if (strncmp(info.path, "serial:", 7) == 0)
m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
}
}
gp_port_info_list_free(list);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
if(index < 0) {
slot_error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").arg(model));
" Configuration options may be incorrect.").tqarg(model));
}
int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
setPortType(INDEX_USB);
} else {
slot_error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").arg(model));
" Configuration options may be incorrect.").tqarg(model));
}
}



+ 6
- 6
kamera/kioslave/kamera.cpp View File

@@ -30,7 +30,7 @@
#include <errno.h>

#include <tqfile.h>
#include <textstream.h>
#include <tqtextstream.h>

#include <kdebug.h>
#include <kinstance.h>
@@ -55,7 +55,7 @@ extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv);

static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data);
static unsigned int frontendProgressStart(
GPContext *context, float totalsize, const char *format,
va_list args, void *data
@@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url)

#undef GPHOTO_TEXT_FILE
// emit info message
infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) );
infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );

// Note: There's no need to re-read directory for each get() anymore
gp_file_new(&m_file);
@@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
}

// register gphoto2 callback functions
gp_context_set_status_func(m_context, frontendCameraStatus, this);
gp_context_set_status_func(m_context, frontendCameratqStatus, this);
gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this);
// gp_camera_set_message_func(m_camera, ..., this)

@@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo

if (info.file.fields & GP_FILE_INFO_TYPE) {
atom.m_uds = UDS_MIME_TYPE;
atom.m_str = TQString::fromLatin1(info.file.type);
atom.m_str = TQString::tqfromLatin1(info.file.type);
udsEntry.append(atom);
}

@@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart(
}

// this callback function is activated on every status message from gphoto2
static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
{
KameraProtocol *object = (KameraProtocol*)data;
char *status;


+ 7
- 7
kcoloredit/colorselector.cpp View File

@@ -17,7 +17,7 @@

#include <math.h>

#include <layout.h>
#include <tqlayout.h>
/* #include <tqtabwidget.h> */
#include <tqradiobutton.h>
#include <tqlabel.h>
@@ -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* layout = new TQHBoxLayout();
TQHBoxLayout* tqlayout = 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);
layout->addLayout(colorChangeLayout, 10);
tqlayout->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);
layout->addWidget(vLine);
layout->addWidget(textEditSelection, 1);
tqlayout->addWidget(vLine);
tqlayout->addWidget(textEditSelection, 1);
colorPatch = new KColorPatch(this);
connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
colorPatch->setMinimumSize(80, 64);
layout->addWidget(colorPatch, 10);
topLayout->addLayout(layout);
tqlayout->addWidget(colorPatch, 10);
topLayout->addLayout(tqlayout);
}
ColorSelector::~ColorSelector() {
}


+ 5
- 5
kcoloredit/gradientselection.cpp View File

@@ -15,7 +15,7 @@
* *
***************************************************************************/

#include <layout.h>
#include <tqlayout.h>
#include <tqframe.h>
#include <tqradiobutton.h>
#include <tqcolor.h>
@@ -26,13 +26,13 @@

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


+ 1
- 1
kcoloredit/kcoloredit.h View File

@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
KColorEditDoc *document() const;

protected:
/** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
* file
*/
void saveOptions();


+ 3
- 3
kcoloredit/kcoloreditdoc.cpp View File

@@ -19,7 +19,7 @@
#include <tqdir.h>
#include <tqfileinfo.h>
#include <tqwidget.h>
#include <clipboard.h>
#include <tqclipboard.h>

// include files for KDE
#include <klocale.h>
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
TQString text;
TQTextOStream stream(&text);
palette.save(stream, 0, false);
KApplication::clipboard()->setText(text);
KApplication::tqclipboard()->setText(text);

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


+ 6
- 6
kcoloredit/kcoloreditview.cpp View File

@@ -17,7 +17,7 @@

// include files for TQt
#include <tqpainter.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqvgroupbox.h>
#include <tqlineedit.h>
@@ -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* layout = new TQHBoxLayout();
TQHBoxLayout* tqlayout = 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);
layout->addLayout(addColorLayout, 0);
tqlayout->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);
layout->addWidget(colorAtCursorFrame, 10);
layout->addSpacing(8);
tqlayout->addWidget(colorAtCursorFrame, 10);
tqlayout->addSpacing(8);
paletteLayout->addSpacing(4);
paletteLayout->addLayout(layout);
paletteLayout->addLayout(tqlayout);
paletteLayout->addSpacing(4);
inColorNameChanging = false;
doNotUpdateColorLabels = false;


+ 1
- 1
kcoloredit/kxycolorselector.cpp View File

@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {

void KXYColorSelector::updateContents() {
drawPalette(&pixmap);
repaint();
tqrepaint();
}

void KXYColorSelector::resizeEvent(TQResizeEvent*) {


+ 1
- 1
kcoloredit/kzcolorselector.cpp View File

@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {

void KZColorSelector::updateContents() {
drawPalette(&pixmap);
repaint(false);
tqrepaint(false);
}

void KZColorSelector::resizeEvent(TQResizeEvent*) {


+ 1
- 1
kcoloredit/loadpalettedlg.cpp View File

@@ -17,7 +17,7 @@

#include <string.h>

#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqstring.h>
#include <tqstringlist.h>


+ 1
- 1
kcoloredit/palette.cpp View File

@@ -17,7 +17,7 @@

#include <tqstring.h>
#include <tqstringlist.h>
#include <textstream.h>
#include <tqtextstream.h>
#include <tqregexp.h>
#include <kglobal.h>
#include <kstandarddirs.h>


+ 1
- 1
kcoloredit/palette.h View File

@@ -19,7 +19,7 @@
#define PALETTE_H

#include <tqstring.h>
#include <textstream.h>
#include <tqtextstream.h>
#include <tqfile.h>

#include "color.h"


+ 1
- 1
kcoloredit/paletteview.cpp View File

@@ -15,7 +15,7 @@
* *
***************************************************************************/

#include <layout.h>
#include <tqlayout.h>

#include "kcoloreditview.h"
#include "paletteview.h"


+ 8
- 8
kcoloredit/paletteviewscrolledarea.cpp View File

@@ -19,7 +19,7 @@
#include <tqptrlist.h>
#include <tqcolor.h>
#include <tqcursor.h>
#include <brush.h>
#include <tqbrush.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpen.h>
@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
}

void PaletteViewScrolledArea::repaintPalette() {
repaint(false);
tqrepaint(false);
}

void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
setCellsSizes();
TQPixmap pixmap(size());
TQPainter painter;
painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
TQFontMetrics fontMetrics = painter.fontMetrics();
int maxLineWidth;
if(viewColorNames) {
@@ -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::palette().active().base() ));
TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight());
TQBrush( TQFrame::tqpalette().active().base() ));
TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
TQBrush foregroundBrush;
TQBrush cursorBrush(TQFrame::palette().active().foreground());
TQPen backgroundPen(TQFrame::palette().active().foreground());
TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
TQPen backgroundPen(TQFrame::tqpalette().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* layout) {
const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
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") ));
layout->addWidget(label, row, column*3);
layout->addWidget(lineEdit, row, column*3 + 1);
tqlayout->addWidget(label, row, column*3);
tqlayout->addWidget(lineEdit, row, column*3 + 1);
}

void TextEditSelection::setRgbString(const int red, const int green, const int blue) {


+ 2
- 2
kcoloredit/texteditselection.h View File

@@ -20,7 +20,7 @@

#include <tqwidget.h>
#include <tqlineedit.h>
#include <layout.h>
#include <tqlayout.h>

#include "color.h"

@@ -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* layout);
const int row, const int column, TQGridLayout* tqlayout);
/** sets RGB string in rgbStringLineEdit */
void setRgbString(const int red, const int green, const int blue);


+ 3
- 3
kdvi/TeXFontDefinition.cpp View File

@@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename);
file = fopen( TQFile::encodeName(filename_test), "r");
if (file == 0) {
kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl;
kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl;
return;
} else
filename = filename_test;
@@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
font = new TeXFont_PK(this);
set_char_p = &dviRenderer::set_char;
if ((checksum != 0) && (checksum != font->checksum))
kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl;
kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl;
fontTypeName = "TeX PK";
return;
}
@@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
#else
// If we don't have the FreeType library, we should never have
// reached this point. Complain, and leave this font blank
kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl;
kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl;
#endif
}



+ 1
- 1
kdvi/TeXFontDefinition.h View File

@@ -1,6 +1,6 @@
// -*- C++ -*-
/*
* The layout of a font information block.
* The tqlayout 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.


+ 10
- 10
kdvi/TeXFont_PFB.cpp View File

@@ -41,13 +41,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
if ( error == FT_Err_Unknown_File_Format ) {
errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(parent->filename);
errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
} else
if ( error ) {
errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename);
errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
// TeX is only able to address character codes 0-255 while
// e.g. Type1 fonts may contain several thousands of characters)
if (enc != 0) {
parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));

// An encoding vector is given for this font, i.e. an array of
// character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -168,7 +168,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 );
error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
if (error) {
TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(parent->filename);
TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -184,7 +184,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );

if (error) {
TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
// convert to an anti-aliased bitmap
error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
if (error) {
TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;
@@ -209,8 +209,8 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T

if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
if (errorMessage.isEmpty())
errorMessage = i18n("Glyph #%1 is empty.").arg(ch);
kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl;
errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
g->shrunkenCharacter.resize( 15, 15 );
g->shrunkenCharacter.fill(TQColor(255, 0, 0));
g->x2 = 0;
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
if (error) {
TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;


+ 8
- 8
kdvi/TeXFont_PK.cpp View File

@@ -91,7 +91,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
characterBitmaps[i] = 0;
file = fopen(TQFile::encodeName(parent->filename), "r");
if (file == 0)
kdError(4300) << i18n("Cannot open font file %1.").arg(parent->filename) << endl;
kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
#ifdef DEBUG_PK
else
kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
// If the character is not defined in the PK file, mark the
// character as missing, and print an error message
if (g->addr == 0) {
kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(parent->filename) << endl;
kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
g->addr = -1;
return g;
}
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
case PK_NOOP :
break;
default :
oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) );
oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
break;
}
}
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
w = num(fp, n);
h = num(fp, n);
if (w > 0x7fff || h > 0x7fff)
oops(i18n("The character %1 is too large in file %2").arg(ch).arg(parent->filename));
oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
characterBitmaps[ch]->w = w;
characterBitmaps[ch]->h = h;
}
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
paint_switch = 1 - paint_switch;
}
if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
oops(i18n("Wrong number of bits stored: char. %1, font %2").tqarg(ch).tqarg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
}
// The data in the bitmap is now in the processor's bit order,
@@ -712,9 +712,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
paint_switch = 1 - paint_switch;
}
if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
oops(i18n("Wrong number of bits stored: char. %1, font %2").tqarg(ch).tqarg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
}
} // endif: big or small Endian?
}


+ 1
- 1
kdvi/dviFile.cpp View File

@@ -256,7 +256,7 @@ void dvifile::prepare_pages()
while (i > 0) {
command_pointer = dvi_Data() + page_offset[i--];
if (readUINT8() != BOP) {
errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1);
return;
}
command_pointer += 10 * 4;


+ 11
- 11
kdvi/dviRenderer.cpp View File

@@ -15,11 +15,11 @@
#include <string.h>

#include <tqcheckbox.h>
#include <clipboard.h>
#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqmessagebox.h>
#include <tqpaintdevice.h>
#include <tqpainter.h>
@@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
TQLabel *label2 = new TQLabel( i18n("<qt>This DVI file contains source file information. You may click into the text with the "
"middle mouse button, and an editor will open the TeX-source file immediately.</qt>"),
contents);
label2->setMinimumSize(label2->sizeHint());
label2->setMinimumSize(label2->tqsizeHint());
lay->add( label2 );
lay->addStretch(1);
TQSize extraSize = TQSize(50,30);
@@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
"KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
"KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
i18n("File Error!"));
return false;
}
@@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
"type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
.arg( fname )
.arg( mimetype ) );
.tqarg( fname )
.tqarg( mimetype ) );
return false;
}
@@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>")
.arg( fname ) );
.tqarg( fname ) );
return false;
}

@@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
"line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
"does not contain the necessary source file information. "
"We refer to the manual of KDVI for a detailed explanation on how to include this "
"information. Press the F1 key to open the manual.</qt>").arg(refLineNumber).arg(refFileName),
"information. Press the F1 key to open the manual.</qt>").tqarg(refLineNumber).tqarg(refFileName),
i18n("Could Not Find Reference"));
mutex.unlock();
return Anchor();
@@ -681,7 +681,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
} else
if (anchorForRefFileFound == false)
KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
"line %1 in the TeX-file <strong>%2</strong>.</qt>").arg(refLineNumber).arg(refFileName),
"line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
i18n( "Could Not Find Reference" ));
else {
mutex.unlock();
@@ -735,7 +735,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
{
KMessageBox::sorry(parentWidget, TQString("<qt>") +
i18n("The DVI-file refers to the TeX-file "
"<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
"<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
TQString("</qt>"),
i18n( "Could Not Find File" ));
return;
@@ -786,7 +786,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
"for inverse search, reported an error. You might wish to look at the <strong>document info "
"dialog</strong> which you will find in the File-Menu for a precise error report. The "
"manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, "
"and a list of common problems.</qt>").arg(command);
"and a list of common problems.</qt>").tqarg(command);
info->clear(i18n("Starting the editor..."));


+ 2
- 2
kdvi/dviRenderer_draw.cpp View File

@@ -292,7 +292,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;
@@ -567,7 +567,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
break;
default:
errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch);
errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(ch);
return;
} /* end switch*/
} /* end else (ch not a SETCHAR or FNTNUM) */


+ 9
- 9
kdvi/dviRenderer_export.cpp View File

@@ -101,7 +101,7 @@ void dviRenderer::exportPDF()
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -137,12 +137,12 @@ void dviRenderer::exportPDF()
export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename)));
info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));

proc->clearArguments();
finfo.setFile(dviFile->filename);
*proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
*proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
*proc << KShellProcess::quote(dviFile->filename);
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
@@ -200,7 +200,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
return;
TQFileInfo finfo(fileName);
if (finfo.exists()) {
int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"));
if (r == KMessageBox::No)
return;
@@ -300,17 +300,17 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename)));
info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
TQFileInfo finfo(dviFile->filename);
*proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
if (printer == 0)
*proc << "-z"; // export Hyperlinks
if (options.isEmpty() == false)
*proc << options;
*proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
*proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
*proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
*proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
kdError(4300) << "dvips failed to start" << endl;


+ 25
- 25
kdvi/dviRenderer_prescan.cpp View File

@@ -84,7 +84,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)

TQString originalFName = EPSfilename;

embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename));
embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));
tqApp->processEvents();

@@ -102,7 +102,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
for(page=0; page < dviFile->total_pages; page++)
if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1]))
break;
errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").arg(page+1).arg(originalFName);
errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
embedPS_progress->progressBar()->advance(1);
tqApp->processEvents();
return;
@@ -131,13 +131,13 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise

// Generate the PostScript commands to be included
TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
if (rwi != 0)
PS.append( TQString(" %1 @rwi").arg(rwi) );
PS.append( TQString(" %1 @rwi").tqarg(rwi) );
if (rhi != 0)
PS.append( TQString(" %1 @rhi").arg(rhi) );
PS.append( TQString(" %1 @rhi").tqarg(rhi) );
if (angle != 0)
PS.append( TQString(" %1 @angle").arg(angle) );
PS.append( TQString(" %1 @angle").tqarg(angle) );
if (clip != -1)
PS.append(" @clip");
PS.append( " @setspecial\n" );
@@ -252,7 +252,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const TQString& _cp)
dviFile->suggestedPageSize = new pageSize;
dviFile->suggestedPageSize->setPageSize(cp);
} else
printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp));
printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp));

return;
}
@@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
}
if (TQFile::exists(_file))
PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) );
PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_file) );
}


@@ -321,7 +321,7 @@ void dviRenderer::prescan_ParsePSQuoteSpecial(const TQString& cp)
double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( " @beginspecial @setspecial \n" );
PostScriptOutPutString->append( cp );
PostScriptOutPutString->append( " @endspecial \n" );
@@ -375,17 +375,17 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
if (cp.find("ps::[begin]", 0, false) == 0) {
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
} else {
if (cp.find("ps::[end]", 0, false) == 0) {
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
} else {
if (cp.find("ps::", 0, false) == 0) {
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
} else {
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
}
}
}
@@ -459,22 +459,22 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
if (TQFile::exists(EPSfilename)) {
double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( "@beginspecial " );
PostScriptOutPutString->append( TQString(" %1 @llx").arg(llx) );
PostScriptOutPutString->append( TQString(" %1 @lly").arg(lly) );
PostScriptOutPutString->append( TQString(" %1 @urx").arg(urx) );
PostScriptOutPutString->append( TQString(" %1 @ury").arg(ury) );
PostScriptOutPutString->append( TQString(" %1 @llx").tqarg(llx) );
PostScriptOutPutString->append( TQString(" %1 @lly").tqarg(lly) );
PostScriptOutPutString->append( TQString(" %1 @urx").tqarg(urx) );
PostScriptOutPutString->append( TQString(" %1 @ury").tqarg(ury) );
if (rwi != 0)
PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
if (rhi != 0)
PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
if (angle != 0)
PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
if (clip != -1)
PostScriptOutPutString->append(" @clip");
PostScriptOutPutString->append( " @setspecial \n" );
PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) );
PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
PostScriptOutPutString->append( "@endspecial \n" );
}
@@ -633,7 +633,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;


+ 1
- 1
kdvi/dviWidget.cpp View File

@@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
if (cp[i].isDigit() == false)
break;
emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
return;
}
}


+ 2
- 2
kdvi/fontEncoding.cpp View File

@@ -36,7 +36,7 @@ fontEncoding::fontEncoding(const TQString &encName)
encFileName = encFileName.stripWhiteSpace();

if (encFileName.isEmpty()) {
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl;
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(encName) << endl;
return;
}

@@ -76,7 +76,7 @@ fontEncoding::fontEncoding(const TQString &encName)
for(; i<256; i++)
glyphNameVector[i] = ".notdef";
} else {
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl;
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl;
return;
}



+ 1
- 1
kdvi/fontEncoding.h View File

@@ -20,7 +20,7 @@
* MetaFont fonts. A DVI file referres to a MetaFont font by giving an
* at-most-8-character name, such as 'cmr10'. The DVI previewer would
* then locate the associated PK font file (e.g. cmr10.600pk), load
* it, and retrieve the character shaped.
* it, and retrieve the character tqshaped.
*
* Today TeX is also used to access Type1 and TrueType fonts, which it
* was never designed to do. As in the case of MetaFont font, the DVI


+ 1
- 1
kdvi/fontMap.cpp View File

@@ -98,7 +98,7 @@ fontMap::fontMap()
}
file.close();
} else
kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
#ifdef DEBUG_FONTMAP
kdDebug(4300) << "FontMap file parsed. Results:" << endl;


+ 1
- 1
kdvi/fontMap.h View File

@@ -55,7 +55,7 @@ class fontMapEntry {
* Long time ago, when TeX was only used with MetaFont fonts, the DVI
* file would specify a font by giving an 8-character name, such as
* 'cmr10'. The DVI previewer would then locate the associated PK font
* file, load it, and retrieve the character shaped. Happy times, they
* file, load it, and retrieve the character tqshaped. Happy times, they
* were.
*
* Today TeX is also used to access Type1 and TrueType fonts, which do


+ 21
- 21
kdvi/fontpool.cpp View File

@@ -187,12 +187,12 @@ TQString fontPool::status()

text.append("<table WIDTH=\"100%\" NOSAVE >");
text.append( TQString("<tr><td><b>%1</b></td> <td><b>%2</b></td> <td><b>%3</b></td> <td><b>%4</b> <td><b>%5</b></td> <td><b>%6</b></td></tr>")
.arg(i18n("TeX Name"))
.arg(i18n("Family"))
.arg(i18n("Zoom"))
.arg(i18n("Type"))
.arg(i18n("Encoding"))
.arg(i18n("Comment")) );
.tqarg(i18n("TeX Name"))
.tqarg(i18n("Family"))
.tqarg(i18n("Zoom"))
.tqarg(i18n("Type"))
.tqarg(i18n("Encoding"))
.tqarg(i18n("Comment")) );

TeXFontDefinition *fontp = fontList.first();
while ( fontp != 0 ) {
@@ -210,12 +210,12 @@ TQString fontPool::status()

#ifdef HAVE_FREETYPE
tmp << TQString ("<tr><td>%1</td> <td>%2</td> <td>%3%</td> <td>%4</td> <td>%5</td> <td>%6</td></tr>")
.arg(fontp->fontname)
.arg(fontp->getFullFontName())
.arg((int)(fontp->enlargement*100 + 0.5))
.arg(fontp->getFontTypeName())
.arg(encoding)
.arg(errMsg);
.tqarg(fontp->fontname)
.tqarg(fontp->getFullFontName())
.tqarg((int)(fontp->enlargement*100 + 0.5))
.tqarg(fontp->getFontTypeName())
.tqarg(encoding)
.tqarg(errMsg);
#endif

fontp=fontList.next();
@@ -280,7 +280,7 @@ void fontPool::locateFonts()
// present an error message to the user.
if (!areFontsLocated()) {
markFontsAsLocated();
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
KMessageBox::detailedError( 0, i18n("<qt><p>KDVI was not able to locate all the font files "
"which are necessary to display the current DVI file. "
"Your document might be unreadable.</p></qt>"),
@@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
numFontsInJob++;
if (locateTFMonly == true)
shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname));
else {
#ifdef HAVE_FREETYPE
if (FreeType_could_be_loaded == true) {
const TQString &filename = fontsByTeXName.findFileName(fontp->fontname);
if (!filename.isEmpty())
shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename));
shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename));
}
#endif
shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
}
}
fontp=fontList.next();
@@ -363,7 +363,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
"and your document might by unreadable. If this error is reproducable "
"please report the issue to the KDVI developers using the 'Help' menu.<p>" );
TQApplication::restoreOverrideCursor();
KMessageBox::error( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg),
KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
i18n("Problem locating fonts - KDVI") );
markFontsAsLocated();
return;
@@ -399,9 +399,9 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
"typesetting system. If TeX is not installed on your system, you could install the TeTeX distribution (www.tetex.org). "
"If you are sure that TeX is installed, please try to use the kpsewhich program from the command line to check if it "
"really works.</p>");
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg), details,
KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
i18n("Problem locating fonts - KDVI") );
// This makes sure the we don't try to run kpsewhich again
markFontsAsLocated();
@@ -587,7 +587,7 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
TQString dpi = startLine.mid(secondblank+1,lastblank-secondblank-1);

progress.show();
progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) );
}
MetafontOutput = MetafontOutput.remove(0,numleft+1);
}


+ 3
- 3
kdvi/fontprogress.cpp View File

@@ -14,7 +14,7 @@
#include <tqapplication.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
TQVBox *page = makeVBoxMainWidget();

TextLabel1 = new TQLabel( label, page, "TextLabel2" );
TextLabel1->setAlignment( int( TQLabel::AlignCenter ) );
TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel1, whatsThis );
TQToolTip::add( TextLabel1, ttip );

@@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
ProgressBar1 = NULL;
TextLabel2 = new TQLabel( "", page, "TextLabel2" );
TextLabel2->setAlignment( int( TQLabel::AlignCenter ) );
TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
TQWhatsThis::add( TextLabel2, whatsThis );
TQToolTip::add( TextLabel2, ttip );



+ 7
- 7
kdvi/infodialog.cpp View File

@@ -10,9 +10,9 @@
#include <klocale.h>
#include <tqfile.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqregexp.h>
#include <textview.h>
#include <tqtextview.h>
#include <tqtooltip.h>
#include <tqvariant.h>
#include <tqwhatsthis.h>
@@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile)
text = i18n("There is no DVI file loaded at the moment.");
else {
text.append("<table WIDTH=\"100%\" NOSAVE >");
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Filename")).arg(dviFile->filename));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));

TQFile file(dviFile->filename);
if (file.exists())
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
else
text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").tqarg(i18n("The file does no longer exist.")));

text.append(TQString("<tr><td><b> </b></td> <td> </td></tr>"));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("#Pages")).arg(dviFile->total_pages));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Generator/Date")).arg(dviFile->generatorString));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString));
} // else (dviFile == NULL)

TextLabel1->setText( text );


+ 3
- 3
kdvi/kdvi_multipage.cpp View File

@@ -161,7 +161,7 @@ void KDVIMultiPage::slotSave()
fileName = fileName+ending;

if (TQFile(fileName).exists()) {
int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()

// Show the printer options dialog. Return immediately if the user
// aborts.
if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) ))
if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
return;

// This funny method call is necessary for the KPrinter to return
@@ -379,7 +379,7 @@ void KDVIMultiPage::print()
dvips_options += TQString(",");
else
commaflag = 1;
dvips_options += TQString("%1").arg(*it);
dvips_options += TQString("%1").tqarg(*it);
}

// Now print. For that, export the DVI-File to PostScript. Note that


+ 2
- 2
kdvi/main.cpp View File

@@ -77,14 +77,14 @@ int main(int argc, char** argv)

if (!url.isValid())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
return -1;
}

if (!url.isLocalFile())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
"files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
"files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
return -1;
}



+ 1
- 1
kdvi/optionDialogFontsWidget_base.ui View File

@@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>31</width>
<height>121</height>


+ 2
- 2
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -169,7 +169,7 @@
<property name="text">
<string>What is 'inverse search'? </string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="url" stdset="0">
@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>390</width>
<height>21</height>


+ 7
- 7
kdvi/psgs.cpp View File

@@ -211,11 +211,11 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
TQStringList argus;
argus << "gs";
argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH";
argus << TQString("-sDEVICE=%1").arg(*gsDevice);
argus << TQString("-sOutputFile=%1").arg(filename);
argus << TQString("-sExtraIncludePath=%1").arg(includePath);
argus << TQString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels
argus << TQString("-r%1").arg(resolution); // resolution in dpi
argus << TQString("-sDEVICE=%1").tqarg(*gsDevice);
argus << TQString("-sOutputFile=%1").tqarg(filename);
argus << TQString("-sExtraIncludePath=%1").tqarg(includePath);
argus << TQString("-g%1x%2").tqarg(pixel_page_w).tqarg(pixel_page_h); // page size in pixels
argus << TQString("-r%1").tqarg(resolution); // resolution in dpi
argus << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
argus << "-f" << PSfile.name();
@@ -241,7 +241,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
while(proc.readln(GSoutput) != -1) {
if (GSoutput.contains("Unknown device")) {
kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
"the '%1' ghostview device driver.").arg(*gsDevice) << endl;
"the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
knownDevices.remove(gsDevice);
gsDevice = knownDevices.begin();
if (knownDevices.isEmpty())
@@ -267,7 +267,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
"drivers. Note that KDVI needs to be restarted to re-enable PostScript support."
"</p></qt>"));
else {
kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl;
kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
gs_generate_graphics_file(page, filename, magnification);
}
return;


+ 9
- 9
kdvi/special.cpp View File

@@ -222,7 +222,7 @@ void dviRenderer::color_special(const TQString& _cp)
// Take color off the stack
if (colorStack.isEmpty())
printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ).
arg(dviFile->filename).arg(current_page));
tqarg(dviFile->filename).tqarg(current_page));
else
colorStack.pop();
return;
@@ -308,7 +308,7 @@ void parse_special_argument(const TQString& strg, const char* argument_name, int
// Maybe we should open a dialog here.
kdError(4300) << i18n("Malformed parameter in the epsf special command.\n"
"Expected a float to follow %1 in %2")
.arg(argument_name).arg(strg) << endl;
.tqarg(argument_name).tqarg(strg) << endl;
}
}

@@ -432,7 +432,7 @@ void dviRenderer::epsf_special(const TQString& cp)
foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1);
else
foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter),
i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1);
foreGroundPainter->restore();
}
@@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special()

TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches
foreGroundPainter->setPen(pen);
foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path);
number_of_elements_in_path = 0;
}

@@ -469,12 +469,12 @@ void dviRenderer::TPIC_addPath_special(const TQString& cp)
bool ok;
float xKoord = cp_noWhiteSpace.section(' ', 0, 0).toFloat(&ok);
if (ok == false) {
printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(cp) );
return;
}
float yKoord = cp_noWhiteSpace.section(' ', 1, 1).toFloat(&ok);
if (ok == false) {
printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(cp) );
return;
}
@@ -502,7 +502,7 @@ void dviRenderer::TPIC_setPen_special(const TQString& cp)
bool ok;
penWidth_in_mInch = cp.stripWhiteSpace().toFloat(&ok);
if (ok == false) {
printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) );
penWidth_in_mInch = 0.0;
return;
}
@@ -700,7 +700,7 @@ void dviRenderer::applicationDoSpecial(char *cp)
foreGroundPainter->translate(-x,-y);
} else
printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ).
arg(dviFile->filename).arg(current_page));
tqarg(dviFile->filename).tqarg(current_page));
}

// The graphicx package marks the end of rotated text with this
@@ -722,6 +722,6 @@ void dviRenderer::applicationDoSpecial(char *cp)
(strncasecmp(cp, "background", 10) == 0) )
return;
printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command));
printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command));
return;
}

+ 1
- 1
kdvi/vf.cpp View File

@@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index()
}
}
if (cmnd != POST)
oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd));
oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd));
fclose (VF_file);
file = NULL;


+ 6
- 6
kfax/faxinput.cpp View File

@@ -110,7 +110,7 @@ notetiff(const char *name)


if ((tf = fopen(name, "r")) == NULL) {
TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name));
TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name));
kfaxerror(i18n("Sorry"), mesg);
return 0;
}
@@ -147,7 +147,7 @@ notetiff(const char *name)

if (fseek(tf, IFDoff, SEEK_SET) < 0) {
realbad:
str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name));
str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
kfaxerror(i18n("Sorry"),str);
bad:
if (strips)
@@ -249,7 +249,7 @@ notetiff(const char *name)
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
.arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
.tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count);
kfaxerror(i18n("Message"),str);
goto realbad;
}
@@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip)
pn->length = pn->strips[strip].size;
}
else {
str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname));
str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Warning"),str);
return NULL;
}
@@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip)
/* handle ghostscript / PC Research fax file */
if (Data[24] != 1 || Data[25] != 0){
str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n")
.arg(TQFile::decodeName(pn->pathname));
.tqarg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Message"),str);
}
pn->length -= 64;
@@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip)
pn->height = G3count(pn, pn->expander == g32expand);
if (pn->height == 0) {

str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname));
str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
kfaxerror(i18n("Sorry"),str);
errno = 0;
badfile(pn);


+ 8
- 8
kfax/kfax.cpp View File

@@ -701,7 +701,7 @@ void TopLevel::print(){
printer.setFullPage( true );
printer.setUsePrinterResolution( true );
printer.setCreator( i18n("KFax") + " " KFAXVERSION );
printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
printer.setDocFileName( firstpage->name );
printer.setPageSelection( KPrinter::ApplicationSide );
printer.setMinMax( 1, pages );
@@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
TQSize scaledImageSize = size;
if (size.width() > maxSize.width() || size.height() > maxSize.height() ) {
// Image does not fit - scale it and print centered
scaledImageSize.scale( maxSize, TQSize::ScaleMin );
scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
} else {
// Image does fit - print it in original size, but centered
scaledImageSize.scale( size, TQSize::ScaleMin );
scaledImageSize.tqscale( size, TQSize::ScaleMin );
kdDebug() << "Image does fit - scaling to " << size << endl;
}
kdDebug() << "Final image size " << scaledImageSize << endl;
@@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u)

if ( u.isLocalFile() )
{
TQString string = i18n("Loading '%1'").arg(u.path());
TQString string = i18n("Loading '%1'").tqarg(u.path());
statusbar->message(string);
openadd( u.path());
statusbar->clear();
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
currentpage = pages;
}

TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);

statusbar->changeItem(pagestr, ID_PAGE_NO);

if(Image){
TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
statusbar->changeItem(wh, ID_INS_OVR);
}

TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
// TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
// TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
statusbar->changeItem(resolution, ID_GENERAL);

statusbar->changeItem(thispage->name, ID_FNAME);


+ 1
- 1
kfax/kfax_printsettings.cpp View File

@@ -21,7 +21,7 @@

#include <klocale.h>
#include <tqcheckbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>

KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)


+ 7
- 7
kfax/options.cpp View File

@@ -27,7 +27,7 @@

#include <stdio.h>

#include <layout.h>
#include <tqlayout.h>
#include <klocale.h>
#include <knuminput.h>
#include <tqdir.h>
@@ -60,28 +60,28 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
bg->setColumnLayout( 0, Qt::Horizontal );
mainLayout->addWidget( bg );

TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());

TQHBoxLayout *hbl1 = new TQHBoxLayout();

vbl->addLayout( hbl1 );

displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
displaylabel->setFixedSize( displaylabel->sizeHint() );
displaylabel->setFixedSize( displaylabel->tqsizeHint() );
hbl1->addWidget( displaylabel );

landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
landscape->setFixedSize( landscape->sizeHint() );
landscape->setFixedSize( landscape->tqsizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( landscape );

flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
flip->setFixedSize( flip->sizeHint() );
flip->setFixedSize( flip->tqsizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( flip );

invert = new TQCheckBox(i18n("Invert"), bg,"invert");
invert->setFixedSize( invert->sizeHint() );
invert->setFixedSize( invert->tqsizeHint() );
hbl1->addSpacing( 10 );
hbl1->addWidget( invert );

@@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
rawgroup->setFrameStyle(TQFrame::NoFrame);

rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel");
rawlabel->setFixedSize( rawlabel->sizeHint() );
rawlabel->setFixedSize( rawlabel->tqsizeHint() );
hbl4->addWidget( rawlabel );

g3 = new TQRadioButton("G3",rawgroup,"g3");


+ 3
- 3
kfaxview/faxrenderer.cpp View File

@@ -136,7 +136,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
TQString filename = fi.absFilePath();
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
i18n("File Error"));
// the return value 'false' indicates that this operation was not successful.
mutex.unlock();
@@ -157,11 +157,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
// this case gracefully.
if (fax.errorString().isEmpty())
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
i18n("File Error"));
else
KMessageBox::detailedError( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
fax.errorString(),
i18n("File Error"));
clear();


+ 3
- 3
kfaxview/libkfaximage/kfaximage.cpp View File

@@ -41,7 +41,7 @@ static const char bigTIFF[] = "\x4d\x4d\x00\x2a";
KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
: TQObject(parent,name)
{
KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
loadImage(filename);
}

@@ -327,7 +327,7 @@ KFaxImage::notetiff()
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
.arg(filename()).arg(nstrips).arg(count);
.tqarg(filename()).tqarg(nstrips).tqarg(count);
kfaxerror(str);
goto realbad;
}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
void
KFaxImage::badfile(pagenode *pn)
{
kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
FreeImage(pn);
}



+ 2
- 2
kfaxview/main.cpp View File

@@ -97,14 +97,14 @@ int main(int argc, char** argv)

if (!url.isValid())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
return -1;
}

if (!url.isLocalFile())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
"files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
"files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
return -1;
}



+ 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 += unicodeToTQString( &u, 1 );
result += tqunicodeToTQString( &u, 1 );
}
obj.free();
info.free();


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

@@ -68,7 +68,7 @@ int PageTransition::duration() const
return data->pt->getDuration();
}

PageTransition::Alignment PageTransition::alignment() const
PageTransition::Alignment PageTransition::tqalignment() const
{
return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
}


+ 2
- 2
kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h View File