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

This reverts commit fc33ee2775.
pull/1/head
Timothy Pearson 13 years ago
parent fc33ee2775
commit cfd41d87ca

@ -37,7 +37,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>800</width> <width>800</width>
<height>600</height> <height>600</height>
@ -59,7 +59,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout7</cstring> <cstring>tqlayout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -588,7 +588,7 @@ PostScript</string>
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -620,7 +620,7 @@ PostScript</string>
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>layout4</cstring> <cstring>tqlayout4</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -735,7 +735,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -752,7 +752,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -769,7 +769,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -786,7 +786,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -806,7 +806,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -836,7 +836,7 @@ PostScript</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>297</height> <height>297</height>
@ -1092,7 +1092,7 @@ decomposition</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>31</height> <height>31</height>
@ -1109,7 +1109,7 @@ decomposition</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>31</height> <height>31</height>
@ -1154,7 +1154,7 @@ decomposition</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>31</height> <height>31</height>
@ -1195,7 +1195,7 @@ decomposition</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>31</height> <height>31</height>
@ -1405,7 +1405,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -1435,7 +1435,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>270</height> <height>270</height>
@ -1579,7 +1579,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
@ -1596,7 +1596,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
@ -1613,7 +1613,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
@ -1630,7 +1630,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
@ -1950,7 +1950,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -2100,7 +2100,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -2342,7 +2342,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>110</height> <height>110</height>
@ -2446,7 +2446,7 @@ pixels in the input</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout6</cstring> <cstring>tqlayout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -2462,7 +2462,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -2513,7 +2513,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -2532,7 +2532,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -2541,7 +2541,7 @@ pixels in the input</string>
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -2557,7 +2557,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>113</width> <width>113</width>
<height>20</height> <height>20</height>
@ -2585,7 +2585,7 @@ pixels in the input</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>20</height> <height>20</height>
@ -2607,7 +2607,7 @@ pixels in the input</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout2</cstring> <cstring>tqlayout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -140,7 +140,7 @@ void MainWidget::fileSave() {
{ {
int res; int res;
if(TQFile::exists(saveFilename)) if(TQFile::exists(saveFilename))
res=KMessageBox::warningYesNo(this, i18n("Overwrite %1 ?").arg(saveFilename)); res=KMessageBox::warningYesNo(this, i18n("Overwrite %1 ?").tqarg(saveFilename));
else else
{ {
salva=true; salva=true;
@ -165,14 +165,14 @@ void MainWidget::fileSave() {
emit signalChangeStatusbar(i18n(i18n("Error while saving file"))); emit signalChangeStatusbar(i18n(i18n("Error while saving file")));
return; return;
} }
emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename));
char ch; char ch;
while(in.get(ch)) while(in.get(ch))
out.put(ch); out.put(ch);
in.close(); in.close();
out.close(); out.close();
m_changed=false; m_changed=false;
emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename));
} }
else else
emit signalChangeStatusbar(i18n("File not saved")); emit signalChangeStatusbar(i18n("File not saved"));
@ -186,14 +186,14 @@ void MainWidget::fileSave() {
emit signalChangeStatusbar(i18n("Error while saving file")); emit signalChangeStatusbar(i18n("Error while saving file"));
return; return;
} }
emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename));
char ch; char ch;
while(in.get(ch)) while(in.get(ch))
out.put(ch); out.put(ch);
in.close(); in.close();
out.close(); out.close();
emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename));
m_changed=false; m_changed=false;
} }
} }
@ -226,7 +226,7 @@ void MainWidget::fileSaveAs() {
{ {
int res; int res;
if(TQFile::exists(saveFilename)) if(TQFile::exists(saveFilename))
res=KMessageBox::warningYesNo(this,i18n("Overwrite %1 ?").arg(saveFilename)); res=KMessageBox::warningYesNo(this,i18n("Overwrite %1 ?").tqarg(saveFilename));
else else
{ {
salva=true; salva=true;
@ -251,14 +251,14 @@ void MainWidget::fileSaveAs() {
emit signalChangeStatusbar(i18n("Error while saving file")); emit signalChangeStatusbar(i18n("Error while saving file"));
return; return;
} }
emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("Saving %1...").tqarg(m_outputFilename));
char ch; char ch;
while(in.get(ch)) while(in.get(ch))
out.put(ch); out.put(ch);
in.close(); in.close();
out.close(); out.close();
m_changed=false; m_changed=false;
emit signalChangeStatusbar(i18n("File %1 saved.").arg(m_outputFilename)); emit signalChangeStatusbar(i18n("File %1 saved.").tqarg(m_outputFilename));
} }
else else
emit signalChangeStatusbar(i18n("File not saved")); emit signalChangeStatusbar(i18n("File not saved"));
@ -286,7 +286,7 @@ void MainWidget::fileClose() {
void MainWidget::cut() { void MainWidget::cut() {
if(originalLabel->pixmap()!=0) if(originalLabel->pixmap()!=0)
{ {
TQApplication::clipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); TQApplication::tqclipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap())));
fileClose(); fileClose();
} }
} }
@ -294,12 +294,12 @@ void MainWidget::cut() {
void MainWidget::copy() { void MainWidget::copy() {
if(originalLabel->pixmap()!=0) if(originalLabel->pixmap()!=0)
{ {
TQApplication::clipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap()))); TQApplication::tqclipboard()->setPixmap(TQPixmap(*(originalLabel->pixmap())));
} }
} }
void MainWidget::paste() { void MainWidget::paste() {
TQPixmap clip=TQApplication::clipboard()->pixmap(); TQPixmap clip=TQApplication::tqclipboard()->pixmap();
if(!clip.isNull()) if(!clip.isNull())
{ {
if(!createTmpFilename()) if(!createTmpFilename())
@ -309,7 +309,7 @@ void MainWidget::paste() {
} }
m_outputFilename=""; m_outputFilename="";
TQPixmap pix(TQApplication::clipboard()->pixmap()); TQPixmap pix(TQApplication::tqclipboard()->pixmap());
originalLabel->clear(); originalLabel->clear();
originalLabel->setGeometry(0,0,pix.width(),pix.height()); originalLabel->setGeometry(0,0,pix.width(),pix.height());
originalLabel->setPixmap(pix); originalLabel->setPixmap(pix);
@ -366,7 +366,7 @@ void MainWidget::getImageFromURL(KURL url) {
previewLabel->clear(); previewLabel->clear();
previewLabel->setGeometry(0,0,10,10); previewLabel->setGeometry(0,0,10,10);
imagesTabs->setCurrentPage(0); imagesTabs->setCurrentPage(0);
emit signalChangeStatusbar(i18n("File %1 loaded.").arg(filename)); emit signalChangeStatusbar(i18n("File %1 loaded.").tqarg(filename));
if (!url.isLocalFile()) if (!url.isLocalFile())
KIO::NetAccess::removeTempFile(filename); KIO::NetAccess::removeTempFile(filename);
@ -879,7 +879,7 @@ void MainWidget::tracerExited() {
setCursor(ArrowCursor); setCursor(ArrowCursor);
return; return;
} }
if(tracer.exiStatus()!=0) if(tracer.exitqStatus()!=0)
{ {
emit(signalChangeStatusbar(i18n("Finished with errors"))); emit(signalChangeStatusbar(i18n("Finished with errors")));
TQString tmp(i18n("Error during the process:")); TQString tmp(i18n("Error during the process:"));

@ -27,7 +27,7 @@
#include <tqprocess.h> #include <tqprocess.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <clipboard.h> #include <tqclipboard.h>
#include <tqevent.h> #include <tqevent.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -22,7 +22,7 @@
#include "mainwidget.h" #include "mainwidget.h"
#include <tqlabel.h> #include <tqlabel.h>
#include <clipboard.h> #include <tqclipboard.h>
#include <kmainwindow.h> #include <kmainwindow.h>
#include <klocale.h> #include <klocale.h>

Loading…
Cancel
Save