diff --git a/src/MainWidgetBase.ui b/src/MainWidgetBase.ui index 93cf508..d1d1323 100644 --- a/src/MainWidgetBase.ui +++ b/src/MainWidgetBase.ui @@ -37,7 +37,7 @@ 0 - + 800 600 @@ -59,7 +59,7 @@ - layout7 + tqlayout7 @@ -588,7 +588,7 @@ PostScript - layout3 + tqlayout3 @@ -620,7 +620,7 @@ PostScript - layout4 + tqlayout4 @@ -735,7 +735,7 @@ PostScript Expanding - + 20 40 @@ -752,7 +752,7 @@ PostScript Expanding - + 20 40 @@ -769,7 +769,7 @@ PostScript Expanding - + 40 20 @@ -786,7 +786,7 @@ PostScript Expanding - + 40 20 @@ -806,7 +806,7 @@ PostScript Expanding - + 20 16 @@ -836,7 +836,7 @@ PostScript Expanding - + 20 297 @@ -1092,7 +1092,7 @@ decomposition Expanding - + 80 31 @@ -1109,7 +1109,7 @@ decomposition Expanding - + 80 31 @@ -1154,7 +1154,7 @@ decomposition Expanding - + 80 31 @@ -1195,7 +1195,7 @@ decomposition Expanding - + 80 31 @@ -1405,7 +1405,7 @@ pixels in the input Expanding - + 20 40 @@ -1435,7 +1435,7 @@ pixels in the input Expanding - + 20 270 @@ -1579,7 +1579,7 @@ pixels in the input Expanding - + 71 21 @@ -1596,7 +1596,7 @@ pixels in the input Expanding - + 71 21 @@ -1613,7 +1613,7 @@ pixels in the input Expanding - + 71 21 @@ -1630,7 +1630,7 @@ pixels in the input Expanding - + 71 21 @@ -1950,7 +1950,7 @@ pixels in the input Expanding - + 20 30 @@ -2100,7 +2100,7 @@ pixels in the input Expanding - + 20 20 @@ -2342,7 +2342,7 @@ pixels in the input Expanding - + 20 110 @@ -2446,7 +2446,7 @@ pixels in the input - layout6 + tqlayout6 @@ -2462,7 +2462,7 @@ pixels in the input Expanding - + 40 20 @@ -2513,7 +2513,7 @@ pixels in the input Expanding - + 40 20 @@ -2532,7 +2532,7 @@ pixels in the input Expanding - + 20 16 @@ -2541,7 +2541,7 @@ pixels in the input - layout3 + tqlayout3 @@ -2557,7 +2557,7 @@ pixels in the input Expanding - + 113 20 @@ -2585,7 +2585,7 @@ pixels in the input Expanding - + 60 20 @@ -2607,7 +2607,7 @@ pixels in the input - layout2 + tqlayout2 diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 202f447..03cca92 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -140,7 +140,7 @@ void MainWidget::fileSave() { { int res; if(TQFile::exists(saveFilename)) - res=KMessageBox::warningYesNo(this, i18n("Overwrite %1 ?").arg(saveFilename)); + res=KMessageBox::warningYesNo(this, i18n("Overwrite %1 ?").tqarg(saveFilename)); else { salva=true; @@ -165,14 +165,14 @@ void MainWidget::fileSave() { emit signalChangeStatusbar(i18n(i18n("Error while saving file"))); return; } - emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename)); char ch; while(in.get(ch)) out.put(ch); in.close(); out.close(); m_changed=false; - emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename)); } else emit signalChangeStatusbar(i18n("File not saved")); @@ -186,14 +186,14 @@ void MainWidget::fileSave() { emit signalChangeStatusbar(i18n("Error while saving file")); return; } - emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename)); char ch; while(in.get(ch)) out.put(ch); in.close(); out.close(); - emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename)); m_changed=false; } } @@ -226,7 +226,7 @@ void MainWidget::fileSaveAs() { { int res; if(TQFile::exists(saveFilename)) - res=KMessageBox::warningYesNo(this,i18n("Overwrite %1 ?").arg(saveFilename)); + res=KMessageBox::warningYesNo(this,i18n("Overwrite %1 ?").tqarg(saveFilename)); else { salva=true; @@ -251,14 +251,14 @@ void MainWidget::fileSaveAs() { emit signalChangeStatusbar(i18n("Error while saving file")); return; } - emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename)); char ch; while(in.get(ch)) out.put(ch); in.close(); out.close(); m_changed=false; - emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); + emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename)); } else emit signalChangeStatusbar(i18n("File not saved")); @@ -286,7 +286,7 @@ void MainWidget::fileClose() { void MainWidget::cut() { if(originalLabel->pixmap()!=0) { - TQApplication::clipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); + TQApplication::tqclipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); fileClose(); } } @@ -294,12 +294,12 @@ void MainWidget::cut() { void MainWidget::copy() { if(originalLabel->pixmap()!=0) { - TQApplication::clipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); + TQApplication::tqclipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); } } void MainWidget::paste() { - TQPixmap clip=TQApplication::clipboard()->pixmap(); + TQPixmap clip=TQApplication::tqclipboard()->pixmap(); if(!clip.isNull()) { if(!createTmpFilename()) @@ -309,7 +309,7 @@ void MainWidget::paste() { } m_outputFilename=""; - TQPixmap pix(TQApplication::clipboard()->pixmap()); + TQPixmap pix(TQApplication::tqclipboard()->pixmap()); originalLabel->clear(); originalLabel->setGeometry(0,0,pix.width(),pix.height()); originalLabel->setPixmap(pix); @@ -366,7 +366,7 @@ void MainWidget::getImageFromURL(KURL url) { previewLabel->clear(); previewLabel->setGeometry(0,0,10,10); imagesTabs->setCurrentPage(0); - emit signalChangeStatusbar(i18n("File %1 loaded.").arg(filename)); + emit signalChangeStatusbar(i18n("File %1 loaded.").tqarg(filename)); if (!url.isLocalFile()) KIO::NetAccess::removeTempFile(filename); @@ -879,7 +879,7 @@ void MainWidget::tracerExited() { setCursor(ArrowCursor); return; } - if(tracer.exiStatus()!=0) + if(tracer.exitqStatus()!=0) { emit(signalChangeStatusbar(i18n("Finished with errors"))); TQString tmp(i18n("Error during the process:")); diff --git a/src/mainwidget.h b/src/mainwidget.h index 03788f3..4c4aeae 100644 --- a/src/mainwidget.h +++ b/src/mainwidget.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/potracegui.cpp b/src/potracegui.cpp index bfedb0b..815bbb7 100644 --- a/src/potracegui.cpp +++ b/src/potracegui.cpp @@ -22,7 +22,7 @@ #include "mainwidget.h" #include -#include +#include #include #include