Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
45f529de24
100 changed files with 329 additions and 329 deletions
  1. 1
    1
      kamera/kcontrol/kamera.cpp
  2. 2
    2
      kamera/kcontrol/kameradevice.cpp
  3. 4
    4
      kamera/kioslave/kamera.cpp
  4. 2
    2
      kdvi/TeXFont_PFB.cpp
  5. 1
    1
      kdvi/dviRenderer.cpp
  6. 2
    2
      kdvi/fontprogress.cpp
  7. 1
    1
      kdvi/optionDialogFontsWidget_base.ui
  8. 1
    1
      kdvi/optionDialogSpecialWidget_base.ui
  9. 1
    1
      kdvi/special.cpp
  10. 5
    5
      kfax/options.cpp
  11. 1
    1
      kfaxview/libkfaximage/kfaximage.cpp
  12. 5
    5
      kfile-plugins/jpeg/exif.cpp
  13. 1
    1
      kfile-plugins/ps/gscreator.cpp
  14. 1
    1
      kgamma/kcmkgamma/displaynumber.cpp
  15. 7
    7
      kgamma/kcmkgamma/kgamma.cpp
  16. 1
    1
      kghostview/displayoptions.cpp
  17. 1
    1
      kghostview/gssettingswidget.ui
  18. 1
    1
      kghostview/infodialog.cpp
  19. 1
    1
      kghostview/kgv_miniwidget.cpp
  20. 3
    3
      kghostview/kgvconfigdialog.cpp
  21. 1
    1
      kghostview/kgvfactory.cpp
  22. 1
    1
      kghostview/kgvpagedecorator.cpp
  23. 1
    1
      kghostview/kgvshell.cpp
  24. 15
    15
      kghostview/viewcontrol.cpp
  25. 1
    1
      kiconedit/kcolorgrid.cpp
  26. 1
    1
      kiconedit/kcolorgrid.h
  27. 1
    1
      kiconedit/kiconcolors.cpp
  28. 3
    3
      kiconedit/kiconconfig.cpp
  29. 2
    2
      kiconedit/kiconedit.cpp
  30. 1
    1
      kiconedit/kiconedit.h
  31. 1
    1
      kiconedit/kicongrid.cpp
  32. 1
    1
      kiconedit/knew.cpp
  33. 2
    2
      kiconedit/palettetoolbar.cpp
  34. 3
    3
      kmrml/kmrml/algorithmdialog.cpp
  35. 1
    1
      kmrml/kmrml/kcontrol/indexcleaner.cpp
  36. 2
    2
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  37. 1
    1
      kmrml/kmrml/kcontrol/mainpage.cpp
  38. 2
    2
      kmrml/kmrml/kcontrol/serverconfigwidget.ui
  39. 1
    1
      kmrml/kmrml/lib/kmrml_config.cpp
  40. 1
    1
      kmrml/kmrml/lib/kmrml_config.h
  41. 12
    12
      kmrml/kmrml/mrml_part.cpp
  42. 3
    3
      kmrml/kmrml/mrml_part.h
  43. 8
    8
      kmrml/kmrml/mrml_view.cpp
  44. 1
    1
      kmrml/kmrml/mrml_view.h
  45. 2
    2
      kolourpaint/kpcommandhistory.cpp
  46. 48
    48
      kolourpaint/kpdefs.h
  47. 5
    5
      kolourpaint/kpdocument.cpp
  48. 1
    1
      kolourpaint/kpdocumentmetainfo.cpp
  49. 14
    14
      kolourpaint/kpdocumentsaveoptions.cpp
  50. 1
    1
      kolourpaint/kpmainwindow.cpp
  51. 1
    1
      kolourpaint/kpmainwindow.h
  52. 1
    1
      kolourpaint/kpmainwindow_settings.cpp
  53. 1
    1
      kolourpaint/kpmainwindow_text.cpp
  54. 1
    1
      kolourpaint/kpmainwindow_view.cpp
  55. 5
    5
      kolourpaint/kpselection.cpp
  56. 2
    2
      kolourpaint/kpselection.h
  57. 5
    5
      kolourpaint/kpselectiondrag.cpp
  58. 1
    1
      kolourpaint/kpselectiondrag.h
  59. 3
    3
      kolourpaint/kpthumbnail.cpp
  60. 3
    3
      kolourpaint/kptool.cpp
  61. 1
    1
      kolourpaint/kptool.h
  62. 1
    1
      kolourpaint/kpviewscrollablecontainer.cpp
  63. 1
    1
      kolourpaint/pixmapfx/kpeffectbalance.cpp
  64. 3
    3
      kolourpaint/pixmapfx/kpeffectsdialog.cpp
  65. 6
    6
      kolourpaint/pixmapfx/kppixmapfx.cpp
  66. 8
    8
      kolourpaint/tools/kptoolresizescale.cpp
  67. 4
    4
      kolourpaint/widgets/kpcolorsimilaritycube.cpp
  68. 1
    1
      kolourpaint/widgets/kpcolorsimilaritycube.h
  69. 11
    11
      kolourpaint/widgets/kpcolortoolbar.cpp
  70. 2
    2
      kolourpaint/widgets/kpcolortoolbar.h
  71. 3
    3
      kolourpaint/widgets/kpsqueezedtextlabel.cpp
  72. 1
    1
      kolourpaint/widgets/kpsqueezedtextlabel.h
  73. 6
    6
      kolourpaint/widgets/kptoolwidgetbase.cpp
  74. 6
    6
      kooka/img_saver.cpp
  75. 2
    2
      kooka/imgnamecombo.cpp
  76. 1
    1
      kooka/imgprintdialog.cpp
  77. 4
    4
      kooka/kocrbase.cpp
  78. 1
    1
      kooka/kooka.cpp
  79. 6
    6
      kooka/kookapref.cpp
  80. 3
    3
      kooka/kookaview.cpp
  81. 1
    1
      kooka/scanpackager.cpp
  82. 2
    2
      kooka/thumbview.cpp
  83. 10
    10
      kpdf/conf/dlgaccessibility.ui
  84. 2
    2
      kpdf/conf/dlggeneral.ui
  85. 3
    3
      kpdf/conf/dlgperformance.ui
  86. 1
    1
      kpdf/conf/dlgpresentation.ui
  87. 1
    1
      kpdf/core/document.cpp
  88. 2
    2
      kpdf/core/generator_pdf/generator_pdf.cpp
  89. 1
    1
      kpdf/core/pagetransition.h
  90. 1
    1
      kpdf/part.cpp
  91. 3
    3
      kpdf/ui/minibar.cpp
  92. 1
    1
      kpdf/ui/pagepainter.cpp
  93. 6
    6
      kpdf/ui/pageview.cpp
  94. 6
    6
      kpdf/ui/presentationwidget.cpp
  95. 2
    2
      kpdf/ui/propertiesdialog.cpp
  96. 1
    1
      kpdf/ui/thumbnaillist.h
  97. 10
    10
      kpovmodeler/pmactions.cpp
  98. 2
    2
      kpovmodeler/pmbicubicpatch.cpp
  99. 1
    1
      kpovmodeler/pmbicubicpatch.h
  100. 0
    0
      kpovmodeler/pmblendmapmodifiers.cpp

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

@@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));

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

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

@@ -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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
m_modelSel->setSizePolicy(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::tqfromLatin1(info.path).mid(7));
m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
}
}
gp_port_info_list_free(list);

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

@@ -55,7 +55,7 @@ extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv);

static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data);
static void frontendCameraStatus(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
@@ -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, frontendCameratqStatus, this);
gp_context_set_status_func(m_context, frontendCameraStatus, 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::tqfromLatin1(info.file.type);
atom.m_str = TQString::fromLatin1(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 frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
{
KameraProtocol *object = (KameraProtocol*)data;
char *status;

+ 2
- 2
kdvi/TeXFont_PFB.cpp View File

@@ -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::tqfromLatin1( "Encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));

// An encoding vector is given for this font, i.e. an array of
// character names (such as: 'parenleft' or 'dotlessj'). We use

+ 1
- 1
kdvi/dviRenderer.cpp View File

@@ -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->tqsizeHint());
label2->setMinimumSize(label2->sizeHint());
lay->add( label2 );
lay->addStretch(1);
TQSize extraSize = TQSize(50,30);

+ 2
- 2
kdvi/fontprogress.cpp View File

@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
TQVBox *page = makeVBoxMainWidget();

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


+ 1
- 1
kdvi/optionDialogFontsWidget_base.ui View File

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

+ 1
- 1
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>390</width>
<height>21</height>

+ 1
- 1
kdvi/special.cpp View File

@@ -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->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path);
foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
number_of_elements_in_path = 0;
}


+ 5
- 5
kfax/options.cpp View File

@@ -67,21 +67,21 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
vbl->addLayout( hbl1 );

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

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

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

invert = new TQCheckBox(i18n("Invert"), bg,"invert");
invert->setFixedSize( invert->tqsizeHint() );
invert->setFixedSize( invert->sizeHint() );
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->tqsizeHint() );
rawlabel->setFixedSize( rawlabel->sizeHint() );
hbl4->addWidget( rawlabel );

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

+ 1
- 1
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::tqfromLatin1("libkfaximage") );
KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
loadImage(filename);
}


+ 5
- 5
kfile-plugins/jpeg/exif.cpp View File

@@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
switch(Tag){

case TAG_MAKE:
ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31);
ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31);
break;

case TAG_MODEL:
ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39);
ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39);
break;

case TAG_ORIENTATION:
@@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
break;

case TAG_DATETIME_ORIGINAL:
DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19);
DateTime = TQString::fromLatin1((const char*)ValuePtr, 19);
break;

case TAG_USERCOMMENT:
@@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
int c;
c = (ValuePtr)[a];
if (c != '\0' && c != ' '){
UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199);
UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199);
break;
}
}
}else{
UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199);
UserComment = TQString::fromLatin1((const char*)ValuePtr, 199);
}
break;


+ 1
- 1
kfile-plugins/ps/gscreator.cpp View File

@@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
return false;
}

TQString previewstr = TQString::tqfromLatin1(buf);
TQString previewstr = TQString::fromLatin1(buf);
free(buf);

int offset = 0;

+ 1
- 1
kgamma/kcmkgamma/displaynumber.cpp View File

@@ -28,7 +28,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \

setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setBackgroundMode(TQt::PaletteBase);
tqsetAlignment(TQt::AlignCenter);
setAlignment(TQt::AlignCenter);
setFocusPolicy(TQ_NoFocus);
}


+ 7
- 7
kgamma/kcmkgamma/kgamma.cpp View File

@@ -157,37 +157,37 @@ void KGamma::setupUI() {
pic1->setMinimumSize(530, 171);
pic1->setBackgroundPixmap(background);
pic1->setPixmap(TQPixmap(locate("data", "kgamma/pics/greyscale.png")));
pic1->tqsetAlignment(AlignCenter);
pic1->setAlignment(AlignCenter);
stack->addWidget( pic1, 0 );

TQLabel *pic2 = new TQLabel(stack);
pic2->setBackgroundPixmap(background);
pic2->setPixmap(TQPixmap(locate("data", "kgamma/pics/rgbscale.png")));
pic2->tqsetAlignment(AlignCenter);
pic2->setAlignment(AlignCenter);
stack->addWidget( pic2, 1 );

TQLabel *pic3 = new TQLabel(stack);
pic3->setBackgroundPixmap(background);
pic3->setPixmap(TQPixmap(locate("data", "kgamma/pics/cmyscale.png")));
pic3->tqsetAlignment(AlignCenter);
pic3->setAlignment(AlignCenter);
stack->addWidget( pic3, 2 );

TQLabel *pic4 = new TQLabel(stack);
pic4->setBackgroundPixmap(background);
pic4->setPixmap(TQPixmap(locate("data", "kgamma/pics/darkgrey.png")));
pic4->tqsetAlignment(AlignCenter);
pic4->setAlignment(AlignCenter);
stack->addWidget( pic4, 3 );

TQLabel *pic5 = new TQLabel(stack);
pic5->setBackgroundPixmap(background);
pic5->setPixmap(TQPixmap(locate("data", "kgamma/pics/midgrey.png")));
pic5->tqsetAlignment(AlignCenter);
pic5->setAlignment(AlignCenter);
stack->addWidget( pic5, 4 );

TQLabel *pic6 = new TQLabel(stack);
pic6->setBackgroundPixmap(background);
pic6->setPixmap(TQPixmap(locate("data", "kgamma/pics/lightgrey.png")));
pic6->tqsetAlignment(AlignCenter);
pic6->setAlignment(AlignCenter);
stack->addWidget( pic6, 5 );

topLayout->addWidget(stack, 10);
@@ -279,7 +279,7 @@ void KGamma::setupUI() {
TQLabel *error = new TQLabel(this);
error->setText(i18n("Gamma correction is not supported by your"
" graphics hardware or driver."));
error->tqsetAlignment(AlignCenter);
error->setAlignment(AlignCenter);
topLayout->addWidget(error);
}
}

+ 1
- 1
kghostview/displayoptions.cpp View File

@@ -76,7 +76,7 @@ TQString DisplayOptions::toString( const DisplayOptions& options )

bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )
{
TQRegExp regex( TQString::tqfromLatin1( rformat ) );
TQRegExp regex( TQString::fromLatin1( rformat ) );
if ( regex.search( in ) < 0 ) return false;

out.reset();

+ 1
- 1
kghostview/gssettingswidget.ui View File

@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>286</width>
<height>20</height>

+ 1
- 1
kghostview/infodialog.cpp View File

@@ -90,7 +90,7 @@ namespace {
"(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?"
"\\)" );
if ( exp.exactMatch( dateStr ) ) {
TQStringList list = exp.tqcapturedTexts();
TQStringList list = exp.capturedTexts();
TQStringList::iterator iter = list.begin();
++iter; // whole string!
#undef GET

+ 1
- 1
kghostview/kgv_miniwidget.cpp View File

@@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC()
}
}
else {
marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 );
marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
}
}


+ 3
- 3
kghostview/kgvconfigdialog.cpp View File

@@ -120,7 +120,7 @@ namespace {
if ( version < TQString::number( 7.00 ) )
{
TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() );
arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) );
arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) );
TQString antiAliasArgs = arguments.join( " " );

Configuration::setAntialiasingArguments( antiAliasArgs );
@@ -140,9 +140,9 @@ void ConfigDialog::showSettings( KGVPart* main ) {
KConfigDialog* dialog = new KConfigDialog( 0, name,
Configuration::self(), KDialogBase::IconList );
dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) );
i18n( "General" ), TQString::fromLatin1( "kghostview" ) );
GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" );
dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) );
dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) );

gssw->setDetectedVersion(Configuration::version());


+ 1
- 1
kghostview/kgvfactory.cpp View File

@@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
*
* as we did before.
*/
args << TQString::tqfromLatin1( className );
args << TQString::fromLatin1( className );
if ( !strcmp( className, "Browser/View" ) ) {
className = "KParts::ReadOnlyPart";
}

+ 1
- 1
kghostview/kgvpagedecorator.cpp View File

@@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p )
if( !r.isValid() )
return;
const TQColorGroup& cg = tqcolorGroup();
const TQColorGroup& cg = colorGroup();

r.moveCenter( r.center() + _shadowOffset );
qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() );

+ 1
- 1
kghostview/kgvshell.cpp View File

@@ -309,7 +309,7 @@ void KGVShell::slotMaximize()

void KGVShell::slotResize()
{
resize( m_gvpart->pageView()->tqsizeHint().width(), height() );
resize( m_gvpart->pageView()->sizeHint().width(), height() );
}

void KGVShell::setFullScreen( bool useFullScreen )

+ 15
- 15
kghostview/viewcontrol.cpp View File

@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
vcGroupBox = new TQGroupBox( this );
vcGroupBox->setFrameStyle( TQFrame::NoFrame );
//vcGroupBox->setTitle( i18n("Force Changes To") );
//vcGroupBox->tqsetAlignment( 1 );
//vcGroupBox->setAlignment( 1 );

topLayout->addWidget( vcGroupBox, 10 );

@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )


magComboBox = new TQComboBox( FALSE, vcGroupBox );
magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
magComboBox->setFixedHeight( magComboBox->sizeHint().height() );


//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )


mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );

connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
orientComboBox->insertItem(i18n("Landscape"));
orientComboBox->insertItem(i18n("Seascape"));
orientComboBox->insertItem(i18n("Upside Down"));
orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );

connect ( orientComboBox, TQT_SIGNAL (activated (int)),
this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )

TQLabel* vcLabel;
vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->tqsizeHint().width() > labelWidth )
labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->sizeHint().width() > labelWidth )
labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );

vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )


vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->tqsizeHint().width() > labelWidth )
labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->sizeHint().width() > labelWidth )
labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );

grid->addWidget( vcLabel, 1, 0 );

vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->tqsizeHint().width() > labelWidth )
labelWidth = vcLabel->tqsizeHint().width();
vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
if ( vcLabel->sizeHint().width() > labelWidth )
labelWidth = vcLabel->sizeHint().width();
vcLabel->setMinimumWidth( labelWidth );

grid->addWidget( vcLabel, 2, 0 );

vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
vcGroupBox->setMinimumWidth(
40 + labelWidth + orientComboBox->tqsizeHint().width() );
40 + labelWidth + orientComboBox->sizeHint().width() );

KSeparator* sep = new KSeparator( KSeparator::HLine, this);
topLayout->addWidget( sep );

+ 1
- 1
kiconedit/kcolorgrid.cpp View File

@@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *)
}
*/

TQSize KColorGrid::tqsizeHint() const
TQSize KColorGrid::sizeHint() const
{
return TQSize(totalwidth, totalheight);
}

+ 1
- 1
kiconedit/kcolorgrid.h View File

@@ -65,7 +65,7 @@ public:

virtual void setCellSize( int s );
virtual int cellSize() { return cellsize; }
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;

void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); }


+ 1
- 1
kiconedit/kiconcolors.cpp View File

@@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col )
int d = spacing();

qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d,
tqcolorGroup(), true, 1, &brush);
colorGroup(), true, 1, &brush);
if ( row * numCols() + col == selected)
painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 );
}

+ 3
- 3
kiconedit/kiconconfig.cpp View File

@@ -49,7 +49,7 @@
static inline TQPixmap loadIcon( const char * name )
{
return KGlobal::instance()->iconLoader()
->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}

KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
@@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent)

TQSize min(300, 400);

if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); }
if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); }
if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); }
if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); }

resize(min);
}

+ 2
- 2
kiconedit/kiconedit.cpp View File

@@ -222,10 +222,10 @@ void KIconEdit::writeConfig()
saveMainWindowSettings( config, "MainWindowSettings" );
}

TQSize KIconEdit::tqsizeHint() const
TQSize KIconEdit::sizeHint() const
{
if(gridview)
return gridview->tqsizeHint();
return gridview->sizeHint();
else
return TQSize(-1, -1);
}

+ 1
- 1
kiconedit/kiconedit.h View File

@@ -65,7 +65,7 @@ public:
KIconEdit( const TQImage image, const char *name = "kiconedit");
~KIconEdit();

virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
static WindowList windowList;

signals:

+ 1
- 1
kiconedit/kicongrid.cpp View File

@@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image)
setColor((y*numCols())+x, *l, false);
}
//kdDebug(4640) << "Row: " << y << endl;
kapp->tqprocessEvents(200);
kapp->processEvents(200);
}

updateColors();

+ 1
- 1
kiconedit/knew.cpp View File

@@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
l->addWidget( rbtempl, 1 );
//l->addWidget(rbtempl, 5, AlignLeft);
//grp->setMinimumSize(grp->tqchildrenRect().size());
//grp->setMinimumSize(grp->childrenRect().size());
grp->setButton( 0 );
}

+ 2
- 2
kiconedit/palettetoolbar.cpp View File

@@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
m_lblPreview = new TQLabel( base );
m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
m_lblPreview->setFixedHeight( 64 );
m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview"
" of the current icon" ) );
m_layout->addWidget( m_lblPreview );
@@ -50,7 +50,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
m_currentColorView = new TQLabel( base );
m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
m_currentColorView->setFixedHeight( 24 );
m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
m_layout->addWidget( m_currentColorView );


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

@@ -49,8 +49,8 @@ protected:
virtual void viewportResizeEvent(TQResizeEvent* ev)
{
TQScrollView::viewportResizeEvent(ev);
m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
kMax(m_frame->tqsizeHint().height(), ev->size().height()));
m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
kMax(m_frame->sizeHint().height(), ev->size().height()));
};

private:
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
mainLayout->activate();
algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
box->setMinimumWidth( algoHLayout->tqsizeHint().width() +
box->setMinimumWidth( algoHLayout->sizeHint().width() +
4 * KDialog::spacingHint() );
}


+ 1
- 1
kmrml/kmrml/kcontrol/indexcleaner.cpp View File

@@ -78,7 +78,7 @@ void IndexCleaner::startNext()
if ( index != -1 )
cmd.replace( index, 2, TQUOTE( dir ) );
else // no %d? What else can we do?
cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );

*m_process << cmd;


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

@@ -86,9 +86,9 @@ void KCMKMrml::checkGiftInstallation()
KMessageBox::error( this, errorMessage );
m_mainPage->hide();
TQLabel *errorLabel = new TQLabel( errorMessage, this );
errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this );
urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
TQLayout *l = tqlayout();
l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );

+ 1
- 1
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
{
TQStringList result;

TQString slash = TQString::tqfromLatin1("/");
TQString slash = TQString::fromLatin1("/");
TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
TQString oldDir, newDir;


+ 2
- 2
kmrml/kmrml/kcontrol/serverconfigwidget.ui View File

@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>200</width>
<height>0</height>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>16</height>

+ 1
- 1
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -104,7 +104,7 @@ bool Config::sync()
void Config::setDefaultHost( const TQString& host )
{
m_defaultHost = host.isEmpty() ?
TQString::tqfromLatin1(DEFAULT_HOST) : host;
TQString::fromLatin1(DEFAULT_HOST) : host;

m_config->setGroup( CONFIG_GROUP );
m_config->writeEntry( "Default Host", m_defaultHost );

+ 1
- 1
kmrml/kmrml/lib/kmrml_config.h View File

@@ -108,7 +108,7 @@ namespace KMrml

TQString settingsGroup( const TQString& host ) const
{
return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
return TQString::fromLatin1( "SettingsFor: " ).append( host );
}

bool m_serverStartedIndividually;

+ 12
- 12
kmrml/kmrml/mrml_part.cpp View File

@@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,

m_algoButton = new TQPushButton( TQString(), m_panel );
m_algoButton->setPixmap( SmallIcon("configure") );
m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
m_algoButton->setFixedSize( m_algoButton->sizeHint() );
connect( m_algoButton, TQT_SIGNAL( clicked() ),
TQT_SLOT( slotConfigureAlgorithm() ));
TQToolTip::add( m_algoButton, i18n("Configure algorithm") );

TQWidget *spacer = new TQWidget( m_panel );
spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Minimum ) );

int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,

m_startButton = new TQPushButton( TQString(), tmp );
connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
settqStatus( NeedCollection );
setStatus( NeedCollection );

setWidget( box );

@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
KMessageBox::information( widget(),
i18n("There is no image collection available\n"
"at %1.\n"), i18n("No Image Collection"));
settqStatus( NeedCollection );
setStatus( NeedCollection );
}
else
m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )

m_url = url;
TQString host = url.host().isEmpty() ?
TQString::tqfromLatin1("localhost") : url.host();
TQString::fromLatin1("localhost") : url.host();

m_hostCombo->setCurrentItem( host );

@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
== KMessageBox::Yes )
{
KApplication::tdeinitExec( "kcmshell",
TQString::tqfromLatin1("kcmkmrml"));
settqStatus( NeedCollection );
TQString::fromLatin1("kcmkmrml"));
setStatus( NeedCollection );
return false;
}
}
@@ -308,7 +308,7 @@ void MrmlPart::contactServer( const KURL& url )
m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );

TQString host = url.host().isEmpty() ?
TQString::tqfromLatin1("localhost") : url.host();
TQString::fromLatin1("localhost") : url.host();

slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
}
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
m_job = 0L;
}

settqStatus( NeedCollection );
setStatus( NeedCollection );

return true;
}
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )

emit started( job );
emit setWindowCaption( url.prettyURL() );
settqStatus( InProgress );
setStatus( InProgress );

return job;
}
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
m_random->setChecked( auto_random );
m_random->setEnabled( !auto_random );
settqStatus( job->error() ? NeedCollection : CanSearch );
setStatus( job->error() ? NeedCollection : CanSearch );

if ( !job->error() && !m_queryList.isEmpty() ) {
// we have a connection and we got a list of relevant URLs to query for
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
openURL( settings.getUrl() );
}

void MrmlPart::settqStatus( tqStatus status )
void MrmlPart::setStatus( Status status )
{
switch ( status )
{

+ 3
- 3
kmrml/kmrml/mrml_part.h View File

@@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart
TQ_OBJECT

public:
enum tqStatus { NeedCollection, CanSearch, InProgress };
enum Status { NeedCollection, CanSearch, InProgress };

MrmlPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList& args );
@@ -116,7 +116,7 @@ private:
void initHostCombo();
void enableServerDependentWidgets( bool enable );

void settqStatus( tqStatus status );
void setStatus( Status status );

void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
CollectionList m_collections;
AlgorithmList m_algorithms;

tqStatus m_status;
Status m_status;
static uint s_sessionId;

};

+ 8
- 8
kmrml/kmrml/mrml_view.cpp View File

@@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
// query result image
TQLabel l( i18n( "No thumbnail available" ), 0L );
l.setFixedSize( 80, 80 );
l.tqsetAlignment( WordBreak | AlignCenter );
l.setAlignment( WordBreak | AlignCenter );
// l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
// l.setLineWidth( 1 );
l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
TQPtrListIterator<MrmlViewItem> it( m_items );

for ( ; it.current(); ++it ) {
itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
}

if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
if ( item == 0 )
rowIt = it;

rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() );
addChild( it.current(), margin + item * itemWidth, y );
it.current()->show();

@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,

/*
if ( similarity > -1 )
TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
.tqarg( url )
.tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
else
TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );
*/

setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )

if ( m_similarity >= 0 ) {
TQPainter p( this );
TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
p.setPen( pen );
int x = margin;
int y = m_combo->y() - similarityHeight - 2;
int w = (int) (similarityFullWidth * m_similarity);
int h = similarityHeight;
p.drawRect( x, y, similarityFullWidth, h );
p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
p.fillRect( x, y, w, h, colorGroup().highlight() );
}
}

@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
m_combo->move( width()/2 - m_combo->width()/2, y );
}

TQSize MrmlViewItem::tqsizeHint() const
TQSize MrmlViewItem::sizeHint() const
{
int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
w += 2 * margin;

+ 1
- 1
kmrml/kmrml/mrml_view.h View File

@@ -126,7 +126,7 @@ public:

void setSimilarity( double value );

virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;

const KURL& url() const { return m_url; }
const KURL& thumbURL() const { return m_thumbURL; }

+ 2
- 2
kolourpaint/kpcommandhistory.cpp View File

@@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
: d (new kpCommandHistoryBasePrivate ())
{
m_actionUndo = new KToolBarPopupAction (undoActionText (),
TQString::tqfromLatin1 ("undo"),
TQString::fromLatin1 ("undo"),
KStdAccel::shortcut (KStdAccel::Undo),
this, TQT_SLOT (undo ()),
ac, KStdAction::name (KStdAction::Undo));

m_actionRedo = new KToolBarPopupAction (redoActionText (),
TQString::tqfromLatin1 ("redo"),
TQString::fromLatin1 ("redo"),
KStdAccel::shortcut (KStdAccel::Redo),
this, TQT_SLOT (redo ()),
ac, KStdAction::name (KStdAction::Redo));

+ 48
- 48
kolourpaint/kpdefs.h View File

@@ -65,71 +65,71 @@
// Settings
//

#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings")
#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time")
#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid")
#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path")
#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity")
#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page")
#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings")
#define kpSettingFirstTime TQString::fromLatin1 ("First Time")
#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid")
#define kpSettingShowPath TQString::fromLatin1 ("Show Path")
#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity")
#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page")

#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")

#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType")
#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth")
#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither")
#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality")
#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType")
#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth")
#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither")
#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality")

#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")

#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")

#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")


#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2")
#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth")
#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth")
#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting")
#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2")
#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth")
#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth")
#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting")


#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings")
#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit")
#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit")
#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit")
#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings")
#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit")
#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit")
#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit")


#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings")
#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown")
#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry")
#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed")
#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle")
#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings")
#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown")
#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry")
#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed")
#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle")


#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")


#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")


#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings")
#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family")
#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size")
#define kpSettingBold TQString::tqfromLatin1 ("Bold")
#define kpSettingItalic TQString::tqfromLatin1 ("Italic")
#define kpSettingUnderline TQString::tqfromLatin1 ("Underline")
#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru")
#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings")
#define kpSettingFontFamily TQString::fromLatin1 ("Font Family")
#define kpSettingFontSize TQString::fromLatin1 ("Font Size")
#define kpSettingBold TQString::fromLatin1 ("Bold")
#define kpSettingItalic TQString::fromLatin1 ("Italic")
#define kpSettingUnderline TQString::fromLatin1 ("Underline")
#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru")


#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2")
#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")


//
@@ -140,11 +140,11 @@
//
// This key only exists if the document does. If it exists, it can be empty.
// The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png".
#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url")
#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url")

// The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png".
// This key does not exist for documents from URLs.
#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size")


#endif // __kp_defs_h__

+ 5
- 5
kolourpaint/kpdocument.cpp View File

@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
metaInfo->setOffset (image.offset ());

TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
TQValueList <TQImageTextKeyLang> keyList = image.textList ();
for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin ();
it != keyList.end ();
it++)
@@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
// low maximum colour depth
i18n ("Lossy File Format"),
KStdGuiItem::save (),
TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
}
else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
{
@@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
.arg (saveOptions.colorDepth ()),
i18n ("Low Color Depth"),
KStdGuiItem::save (),
TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
}
#undef TQUIT_IF_CANCEL

@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
<< ",overwritePrompt=" << overwritePrompt
<< ",lossyPrompt=" << lossyPrompt
<< ")" << endl;
saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
#endif

if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))

+ 1
- 1
kolourpaint/kpdocumentmetainfo.cpp View File

@@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs
void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
{
const TQString usedPrefix = !prefix.isEmpty () ?
prefix + TQString::tqfromLatin1 (":") :
prefix + TQString::fromLatin1 (":") :
TQString();

kdDebug () << usedPrefix << endl;

+ 14
- 14
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt
void kpDocumentSaveOptions::printDebug (const TQString &prefix) const
{
const TQString usedPrefix = !prefix.isEmpty () ?
prefix + TQString::tqfromLatin1 (": ") :
prefix + TQString::fromLatin1 (": ") :
TQString();

kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
{
return config->readEntry (kpSettingForcedMimeType,
TQString::tqfromLatin1 ("image/png"));
TQString::fromLatin1 ("image/png"));
}

// public static
@@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType)
// SYNC: update mime info here
// Greyscale actually (unenforced since depth not set to configurable)
defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
defaultList << TQString::fromLatin1 ("image/x-eps:32");
defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
// Greyscale actually (unenforced since depth not set to configurable)
defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
defaultList << TQString::fromLatin1 ("image/x-xbm:1");

const TQStringList mimeTypeList = mimeTypesSupportingProperty (
kpSettingMimeTypeMaximumColorDepth, defaultList);

const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
for (TQStringList::const_iterator it = mimeTypeList.begin ();
it != mimeTypeList.end ();
it++)
@@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m
TQStringList defaultMimeTypes;

// SYNC: update mime info here
defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx");
defaultMimeTypes << TQString::fromLatin1 ("image/png");
defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
// TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises
// it's either 1 or 24.
defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb");
// TODO: Only 8 and 24 - no 1.
defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm");
defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");

return mimeTypeSupportsProperty (mimeType,
kpSettingMimeTypeHasConfigurableColorDepth,
@@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime
TQStringList defaultMimeTypes;

// SYNC: update mime info here
defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
defaultMimeTypes << TQString::fromLatin1 ("image/jp2");
defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");

return mimeTypeSupportsProperty (mimeType,
kpSettingMimeTypeHasConfigurableQuality,

+ 1
- 1
kolourpaint/kpmainwindow.cpp View File

@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));

// tqStatus bar
// Status bar
connect (m_document, TQT_SIGNAL (documentOpened ()),
this, TQT_SLOT (recalculateStatusBar ()));


+ 1
- 1
kolourpaint/kpmainwindow.h View File

@@ -640,7 +640,7 @@ private slots:


/*
* tqStatus Bar
* Status Bar
*/

private:

+ 1
- 1
kolourpaint/kpmainwindow_settings.cpp View File

@@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig ()
KMessageBox::information (this,
i18n ("You have to restart KolourPaint for these changes to take effect."),
i18n ("Toolbar Settings Changed"),
TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
TQString::fromLatin1 ("ToolBarSettingsChanged"));

//createGUI();
//applyMainWindowSettings (kapp->config (), autoSaveGroup ());

+ 1
- 1
kolourpaint/kpmainwindow_text.cpp View File

@@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings ()
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
KConfigBase *cfg = cfgGroupSaver.config ();

m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times")));
m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false));
m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false));

+ 1
- 1
kolourpaint/kpmainwindow_view.cpp View File

@@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
// Ordinary flicker is better than the whole view moving
TQPainter p (m_mainView);
p.fillRect (m_mainView->rect (),
m_scrollView->viewport ()->tqcolorGroup ().background ());
m_scrollView->viewport ()->colorGroup ().background ());
}
}


+ 5
- 5
kolourpaint/kpselection.cpp View File

@@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
points.detach ();
points.translate (-m_rect.x (), -m_rect.y ());

painter.tqdrawPolygon (points, false/*even-odd algo*/);
painter.drawPolygon (points, false/*even-odd algo*/);
}

painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
it != textLines_.end ();
it++)
{
bigString += TQString::tqfromLatin1 ("\n");
bigString += TQString::fromLatin1 ("\n");
bigString += (*it);
}

@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
}

// public static
TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle)
TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
{
return TQSize (minimumWidthForTextStyle (textStyle),
minimumHeightForTextStyle (textStyle));
@@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle
{
const int about15CharsWidth =
textStyle.fontMetrics ().width (
TQString::tqfromLatin1 ("1234567890abcde"));
TQString::fromLatin1 ("1234567890abcde"));

const int preferredMinWidth =
TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
}

// public
TQSize kpSelection::tqminimumSize () const
TQSize kpSelection::minimumSize () const
{
return TQSize (minimumWidth (), minimumHeight ());
}

+ 2
- 2
kolourpaint/kpselection.h View File

@@ -169,7 +169,7 @@ public:
// Be more robust when external enforcement fails.
static int minimumWidthForTextStyle (const kpTextStyle &);
static int minimumHeightForTextStyle (const kpTextStyle &);
static TQSize tqminimumSizeForTextStyle (const kpTextStyle &);
static TQSize minimumSizeForTextStyle (const kpTextStyle &);

static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle);
static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle);
@@ -177,7 +177,7 @@ public:

int minimumWidth () const;
int minimumHeight () const;
TQSize tqminimumSize () const;
TQSize minimumSize () const;

int textRowForPoint (const TQPoint &globalPoint) const;
int textColForPoint (const TQPoint &globalPoint) const;

+ 5
- 5
kolourpaint/kpselectiondrag.cpp View File

@@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const
}

// public virtual [base TQMimeSource]
TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
{
#if DEBUG_KP_SELECTION_DRAG
kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
#endif

if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
}
else
{
kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
<< " kpSelectionDrag(TQImage) could not decode data into TQImage"
<< endl;
stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
#endif

return TQImageDrag::tqencodedData (mimeType);
return TQImageDrag::encodedData (mimeType);
}
}

@@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel,
#if DEBUG_KP_SELECTION_DRAG
kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl;
#endif
TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType);
TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType);
TQDataStream stream (data, IO_ReadOnly);

// (no need for wali as kpSelection's by definition only support TQPixmap's)

+ 1
- 1
kolourpaint/kpselectiondrag.h View File

@@ -56,7 +56,7 @@ protected:
public:
virtual const char *format (int which = 0) const;
virtual bool provides (const char *mimeType) const;
virtual TQByteArray tqencodedData (const char *mimeType) const;
virtual TQByteArray encodedData (const char *mimeType) const;

static bool canDecode (const TQMimeSource *e);
static bool decode (const TQMimeSource *e, TQImage &img);

+ 3
- 3
kolourpaint/kpthumbnail.cpp View File

@@ -63,12 +63,12 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
}


TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize ();
#if DEBUG_KP_THUMBNAIL
kdDebug () << "\ttqlayout=" << tqlayout ()
<< " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
<< " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl;
kdDebug () << "\tboxLayout=" << boxLayout ()
<< " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
<< " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
<< endl;
#endif
if (tqlayout ())

+ 3
- 3
kolourpaint/kptool.cpp View File

@@ -153,7 +153,7 @@ void kpTool::createAction ()
m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
this, TQT_SLOT (slotActionActivated ()),
m_mainWindow->actionCollection (), name ());
m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
m_action->setWhatsThis (description ());

connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
<< " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
<< " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
<< endl;
kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
#endif

TQt::ButtonState buttonState = e->stateAfter ();
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
text,
caption,
continueButtonText,
TQString::tqfromLatin1 ("BigImageDontAskAgain"));
TQString::fromLatin1 ("BigImageDontAskAgain"));

return (accept == KMessageBox::Continue);
}

+ 1
- 1
kolourpaint/kptool.h View File

@@ -341,7 +341,7 @@ protected:


/*
* User Notifications (tqStatus Bar)
* User Notifications (Status Bar)
*/

public:

+ 1
- 1
kolourpaint/kpviewscrollablecontainer.cpp View File

@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
return;

TQPixmap pixmap (width (), height ());
pixmap.fill (tqcolorGroup ().highlight ());
pixmap.fill (colorGroup ().highlight ());
kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
const TQRect hr = hotRect ();
#if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER

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

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



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

@@ -255,11 +255,11 @@ void kpEffectsDialog::selectEffect (int which)
// Don't resize the preview when showing the widget:
// TODO: actually work

TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
TQLayout::ResizeMode previewGroupBoxResizeMode =
m_previewGroupBox->tqlayout () ?
m_previewGroupBox->tqlayout ()->tqresizeMode () :
m_previewGroupBox->tqlayout ()->resizeMode () :
TQLayout::Auto;
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize

+ 6
- 6
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
painter.setWorldMatrix (transformMatrix);
#if DEBUG_KP_PIXMAP_FX && 0
kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
<< " m12=" << painter.tqworldMatrix ().m12 ()
<< " m21=" << painter.tqworldMatrix ().m21 ()
<< " m22=" << painter.tqworldMatrix ().m22 ()
<< " dx=" << painter.tqworldMatrix ().dx ()
<< " dy=" << painter.tqworldMatrix ().dy ()
kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
<< " m12=" << painter.worldMatrix ().m12 ()
<< " m21=" << painter.worldMatrix ().m21 ()
<< " m22=" << painter.worldMatrix ().m22 ()
<< " dx=" << painter.worldMatrix ().dx ()
<< " dy=" << painter.worldMatrix ().dy ()
<< endl;
#endif
painter.drawPixmap (TQPoint (0, 0), pm);

+ 8
- 8
kolourpaint/tools/kptoolresizescale.cpp View File

@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
// TODO: ALT+R doesn't select the button.
m_resizeButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_resizeButton,
TQString::tqfromLatin1 ("resize"),
TQString::fromLatin1 ("resize"),
i18n ("&Resize"));

m_scaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_scaleButton,
TQString::tqfromLatin1 ("scale"),
TQString::fromLatin1 ("scale"),
i18n ("&Scale"));

m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_smoothScaleButton,
TQString::tqfromLatin1 ("smooth_scale"),
TQString::fromLatin1 ("smooth_scale"),
i18n ("S&mooth Scale"));


@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
//m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);


//m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
//m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
//m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
//m_resizeLabel->setAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
//m_scaleLabel->setAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
//m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);


TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);

TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
widthLabel->setAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
heightLabel->setAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);

TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
m_originalWidthInput = new KIntNumInput (

+ 4
- 4
kolourpaint/widgets/kpcolorsimilaritycube.cpp View File

@@ -138,7 +138,7 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)


// protected virtual [base TQWidget]
TQSize kpColorSimilarityCube::tqsizeHint () const
TQSize kpColorSimilarityCube::sizeHint () const
{
return TQSize (52, 52);
}
@@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
#if DEBUG_KP_COLOR_SIMILARITY_CUBE
kdDebug () << "\tnot enabled - making us grey" << endl;
#endif
colors [0] = tqcolorGroup ().background ();
colors [1] = tqcolorGroup ().background ();
colors [0] = colorGroup ().background ();
colors [1] = colorGroup ().background ();
}

#if DEBUG_KP_COLOR_SIMILARITY_CUBE
@@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p)
TQRect cr (contentsRect ());

TQPixmap backBuffer (cr.width (), cr.height ());
backBuffer.fill (tqcolorGroup ().background ());
backBuffer.fill (colorGroup ().background ());

TQPainter backBufferPainter (&backBuffer);


+ 1
- 1
kolourpaint/widgets/kpcolorsimilaritycube.h View File

@@ -55,7 +55,7 @@ public:
double colorSimilarity () const;
void setColorSimilarity (double similarity);

virtual TQSize tqsizeHint () const;
virtual TQSize sizeHint () const;

protected:
TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;

+ 11
- 11
kolourpaint/widgets/kpcolortoolbar.cpp View File

@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const


// public virtual [base TQWidget]
TQSize kpDualColorButton::tqsizeHint () const
TQSize kpDualColorButton::sizeHint () const
{
return TQSize (52, 52);
}
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
else
{
backBufferPainter.fillRect (m_backBuffer->rect (),
tqcolorGroup ().color (TQColorGroup::Background));
colorGroup ().color (TQColorGroup::Background));
}

TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
if (!isEnabled ())
{
// swapPixmap has a mask after all
swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
}
backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);

@@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26"));
}
else
backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button));
qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
false/*not sunken*/, 2/*lineWidth*/,
0/*never fill*/);

@@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26"));
}
else
backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button));
qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
false/*not sunken*/, 2/*lineWidth*/,
0/*never fill*/);

@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()


// public virtual [base TQWidget]
TQSize kpTransparentColorCell::tqsizeHint () const
TQSize kpTransparentColorCell::sizeHint () const
{
return TQSize (m_pixmap.width () + frameWidth () * 2,
m_pixmap.height () + frameWidth () * 2);
@@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
#endif

m_transparentColorCell = new kpTransparentColorCell (this);
m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
@@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
5/*margin*/, (10 * 4)/*spacing*/);

m_dualColorButton = new kpDualColorButton (mainWindow, base);
m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
@@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);

m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);

+ 2
- 2
kolourpaint/widgets/kpcolortoolbar.h View File

@@ -91,7 +91,7 @@ public:
kpColor oldBackgroundColor () const;

public:
virtual TQSize tqsizeHint () const;
virtual TQSize sizeHint () const;

protected:
TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
kpTransparentColorCell (TQWidget *parent, const char *name = 0);
virtual ~kpTransparentColorCell ();

virtual TQSize tqsizeHint () const;
virtual TQSize sizeHint () const;

signals:
void transparentColorSelected (int mouseButton);

+ 3
- 3
kolourpaint/widgets/kpsqueezedtextlabel.cpp View File

@@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent


// public virtual
TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
TQSize kpSqueezedTextLabel::minimumSizeHint () const
{
#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
<< TQLabel::tqminimumSizeHint () << endl;
kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
<< TQLabel::minimumSizeHint () << endl;
#endif
return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
}

+ 1
- 1
kolourpaint/widgets/kpsqueezedtextlabel.h View File

@@ -43,7 +43,7 @@ public:
kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);

virtual TQSize tqminimumSizeHint () const;
virtual TQSize minimumSizeHint () const;

// TODO: maybe text() should return the full text?
TQString fullText () const;

+ 6
- 6
kolourpaint/widgets/kptoolwidgetbase.cpp View File

@@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();

TQString nameString = TQString::tqfromLatin1 (name ());
TQString nameString = TQString::fromLatin1 (name ());

row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1);
row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
}

#if DEBUG_KP_TOOL_WIDGET_BASE
@@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();

TQString nameString = TQString::tqfromLatin1 (name ());
cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
TQString nameString = TQString::fromLatin1 (name ());
cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
cfg->sync ();
}


+ 6
- 6
kooka/img_saver.cpp View File

@@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name
Q_CHECK_PTR(l_help);
l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
l_help->setText( i18n("-No format selected-" ));
l_help->tqsetAlignment( AlignVCenter | AlignHCenter );
l_help->setAlignment( AlignVCenter | AlignHCenter );
l_help->setMinimumWidth(230);

// Insert Selbox for subformat
@@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const
#include "formathelp.h"
void FormatDialog::buildHelp( void )
{
format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP );
format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM );
format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG );
format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG );
format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS );
format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP );
format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM );
format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG );
format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG );
format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS );
}



+ 2
- 2
kooka/imgnamecombo.cpp View File

@@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo()

void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath )
{
TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath;
TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath;

kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
TQString select = currentText();
@@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt
{
TQString newPath;

newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath;
newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath;

kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl;


+ 1
- 1
kooka/imgprintdialog.cpp View File

@@ -127,7 +127,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n


TQWidget *spaceEater = new TQWidget( this );
spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
tqlayout->addWidget( spaceEater );

/* Set start values */

+ 4
- 4
kooka/kocrbase.cpp View File

@@ -129,7 +129,7 @@ void KOCRBase::imgIntro()
m_previewPix = new TQLabel( m_imgHBox );
m_previewPix->setPixmap(TQPixmap());
m_previewPix->setFixedSize(m_previewSize);
m_previewPix->tqsetAlignment( TQt::AlignCenter );
m_previewPix->setAlignment( TQt::AlignCenter );
m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
// m_previewPix->resize(m_previewSize);

@@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( )
hb_cap->setSpacing( KDialog::spacingHint());

TQLabel *imgLab = new TQLabel( hb_cap );
imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop );
imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop );
imgLab->setPixmap( pix );
pa = hb_cap;
}
@@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro()
KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false );
/* A space eater */
TQWidget *spaceEater = new TQWidget(m_spellchkPage);
spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));

/* connect toggle button */
connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool)));
@@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img)
}
}
TQWidget *spaceEater = new TQWidget( m_metaBox );
spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
m_metaBox->show();
}


+ 1
- 1
kooka/kooka.cpp View File

@@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse)

changeCaption( i18n( "KDE Scanning" ));

setAutoSaveSettings( TQString::tqfromLatin1("General Options"),
setAutoSaveSettings( TQString::fromLatin1("General Options"),
true );
}


+ 6
- 6
kooka/kookapref.cpp View File

@@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage()
#endif
top->addWidget( kgp );
TQWidget *spaceEater = new TQWidget( page );
spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
top->addWidget( spaceEater );

/*
@@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage()

/* Frame Stuff */
int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 );
TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));

TQGrid *fGrid = new TQGrid( 2, hgb3 );
fGrid->setSpacing( 2 );
@@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void )
/* ** startup options ** */

/** write the global one, to read from libkscan also */
konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
konf->setGroup(TQString::fromLatin1(GROUP_STARTUP));
bool cbVal = !(cbShowScannerSelection->isChecked());
kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl;
konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */
@@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void )
m_tileSelector->setURL( KURL(bgImg) );
m_thumbWidth->setValue( 100 );
m_thumbHeight->setValue( 120 );
TQColor col1 = TQColor( tqcolorGroup().base());
TQColor col2 = TQColor( tqcolorGroup().foreground());
TQColor col1 = TQColor( colorGroup().base());
TQColor col2 = TQColor( colorGroup().foreground());

m_frameWidth->setValue( 3 );
m_colButt1->setColor( col1 );

+ 3
- 3
kooka/kookaview.cpp View File

@@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
TQHBox *recentBox = new TQHBox( m_dockRecent );
recentBox->setMargin(KDialog::marginHint());
TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox );
lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
recentFolder = new ImageNameCombo( recentBox );

m_dockRecent->setWidget( recentBox );
@@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU

packager->openRoots();

/* tqStatus Bar */
/* Status Bar */
KStatusBar *statBar = m_mainWindow->statusBar();

// statBar->insertItem(TQString("1"), SBAR_ZOOM, 0, true );
@@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img )
ocrFabric->slSetImage( img );
}

/* tqStatus Bar */
/* Status Bar */
KStatusBar *statBar = m_mainWindow->statusBar();
if( img_canvas )
statBar->changeItem( img_canvas->imageInfoString(), StatusImage );

+ 1
- 1
kooka/scanpackager.cpp View File

@@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
{
kdDebug(28000) << "Trying to decode directory string " << dirString << endl;

TQString searchFor = TQString::tqfromLatin1(" - ");
TQString searchFor = TQString::fromLatin1(" - ");