diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:33 -0600 | 
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:33 -0600 | 
| commit | cfd41d87ca7abc5dee7d2e3975c6bfdb3486dd42 (patch) | |
| tree | 0d282eb4a1e6cd714052b18c3fea28eeb2fed23e /src | |
| parent | fc33ee27759530d7e9646400d34ab135e574f52b (diff) | |
| download | potracegui-cfd41d87ca7abc5dee7d2e3975c6bfdb3486dd42.tar.gz potracegui-cfd41d87ca7abc5dee7d2e3975c6bfdb3486dd42.zip  | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit fc33ee27759530d7e9646400d34ab135e574f52b.
Diffstat (limited to 'src')
| -rw-r--r-- | src/MainWidgetBase.ui | 62 | ||||
| -rw-r--r-- | src/mainwidget.cpp | 28 | ||||
| -rw-r--r-- | src/mainwidget.h | 2 | ||||
| -rw-r--r-- | src/potracegui.cpp | 2 | 
4 files changed, 47 insertions, 47 deletions
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 @@                      <verstretch>0</verstretch>                  </sizepolicy>              </property> -            <property name="maximumSize"> +            <property name="tqmaximumSize">                  <size>                      <width>800</width>                      <height>600</height> @@ -59,7 +59,7 @@          </widget>          <widget class="TQLayoutWidget">              <property name="name"> -                <cstring>layout7</cstring> +                <cstring>tqlayout7</cstring>              </property>              <vbox>                  <property name="name"> @@ -588,7 +588,7 @@ PostScript</string>                                                                      </property>                                                                      <widget class="TQLayoutWidget" row="0" column="0">                                                                          <property name="name"> -                                                                            <cstring>layout3</cstring> +                                                                            <cstring>tqlayout3</cstring>                                                                          </property>                                                                          <vbox>                                                                              <property name="name"> @@ -620,7 +620,7 @@ PostScript</string>                                                                      </widget>                                                                      <widget class="TQLayoutWidget" row="0" column="1">                                                                          <property name="name"> -                                                                            <cstring>layout4</cstring> +                                                                            <cstring>tqlayout4</cstring>                                                                          </property>                                                                          <grid>                                                                              <property name="name"> @@ -735,7 +735,7 @@ PostScript</string>                                                          <property name="sizeType">                                                              <enum>Expanding</enum>                                                          </property> -                                                        <property name="sizeHint"> +                                                        <property name="tqsizeHint">                                                              <size>                                                                  <width>20</width>                                                                  <height>40</height> @@ -752,7 +752,7 @@ PostScript</string>                                                          <property name="sizeType">                                                              <enum>Expanding</enum>                                                          </property> -                                                        <property name="sizeHint"> +                                                        <property name="tqsizeHint">                                                              <size>                                                                  <width>20</width>                                                                  <height>40</height> @@ -769,7 +769,7 @@ PostScript</string>                                                          <property name="sizeType">                                                              <enum>Expanding</enum>                                                          </property> -                                                        <property name="sizeHint"> +                                                        <property name="tqsizeHint">                                                              <size>                                                                  <width>40</width>                                                                  <height>20</height> @@ -786,7 +786,7 @@ PostScript</string>                                                          <property name="sizeType">                                                              <enum>Expanding</enum>                                                          </property> -                                                        <property name="sizeHint"> +                                                        <property name="tqsizeHint">                                                              <size>                                                                  <width>40</width>                                                                  <height>20</height> @@ -806,7 +806,7 @@ PostScript</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>16</height> @@ -836,7 +836,7 @@ PostScript</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>297</height> @@ -1092,7 +1092,7 @@ decomposition</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>80</width>                                                              <height>31</height> @@ -1109,7 +1109,7 @@ decomposition</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>80</width>                                                              <height>31</height> @@ -1154,7 +1154,7 @@ decomposition</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>80</width>                                                              <height>31</height> @@ -1195,7 +1195,7 @@ decomposition</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>80</width>                                                              <height>31</height> @@ -1405,7 +1405,7 @@ pixels in the input</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>40</height> @@ -1435,7 +1435,7 @@ pixels in the input</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>270</height> @@ -1579,7 +1579,7 @@ pixels in the input</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>71</width>                                                              <height>21</height> @@ -1596,7 +1596,7 @@ pixels in the input</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>71</width>                                                              <height>21</height> @@ -1613,7 +1613,7 @@ pixels in the input</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>71</width>                                                              <height>21</height> @@ -1630,7 +1630,7 @@ pixels in the input</string>                                                      <property name="sizeType">                                                          <enum>Expanding</enum>                                                      </property> -                                                    <property name="sizeHint"> +                                                    <property name="tqsizeHint">                                                          <size>                                                              <width>71</width>                                                              <height>21</height> @@ -1950,7 +1950,7 @@ pixels in the input</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>30</height> @@ -2100,7 +2100,7 @@ pixels in the input</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>20</height> @@ -2342,7 +2342,7 @@ pixels in the input</string>                                              <property name="sizeType">                                                  <enum>Expanding</enum>                                              </property> -                                            <property name="sizeHint"> +                                            <property name="tqsizeHint">                                                  <size>                                                      <width>20</width>                                                      <height>110</height> @@ -2446,7 +2446,7 @@ pixels in the input</string>                  </widget>                  <widget class="TQLayoutWidget">                      <property name="name"> -                        <cstring>layout6</cstring> +                        <cstring>tqlayout6</cstring>                      </property>                      <hbox>                          <property name="name"> @@ -2462,7 +2462,7 @@ pixels in the input</string>                              <property name="sizeType">                                  <enum>Expanding</enum>                              </property> -                            <property name="sizeHint"> +                            <property name="tqsizeHint">                                  <size>                                      <width>40</width>                                      <height>20</height> @@ -2513,7 +2513,7 @@ pixels in the input</string>                              <property name="sizeType">                                  <enum>Expanding</enum>                              </property> -                            <property name="sizeHint"> +                            <property name="tqsizeHint">                                  <size>                                      <width>40</width>                                      <height>20</height> @@ -2532,7 +2532,7 @@ pixels in the input</string>                      <property name="sizeType">                          <enum>Expanding</enum>                      </property> -                    <property name="sizeHint"> +                    <property name="tqsizeHint">                          <size>                              <width>20</width>                              <height>16</height> @@ -2541,7 +2541,7 @@ pixels in the input</string>                  </spacer>                  <widget class="TQLayoutWidget">                      <property name="name"> -                        <cstring>layout3</cstring> +                        <cstring>tqlayout3</cstring>                      </property>                      <hbox>                          <property name="name"> @@ -2557,7 +2557,7 @@ pixels in the input</string>                              <property name="sizeType">                                  <enum>Expanding</enum>                              </property> -                            <property name="sizeHint"> +                            <property name="tqsizeHint">                                  <size>                                      <width>113</width>                                      <height>20</height> @@ -2585,7 +2585,7 @@ pixels in the input</string>                              <property name="sizeType">                                  <enum>Expanding</enum>                              </property> -                            <property name="sizeHint"> +                            <property name="tqsizeHint">                                  <size>                                      <width>60</width>                                      <height>20</height> @@ -2607,7 +2607,7 @@ pixels in the input</string>                  </widget>                  <widget class="TQLayoutWidget">                      <property name="name"> -                        <cstring>layout2</cstring> +                        <cstring>tqlayout2</cstring>                      </property>                      <hbox>                          <property name="name"> 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 <tqprocess.h>  #include <tqstringlist.h>  #include <tqpixmap.h> -#include <clipboard.h> +#include <tqclipboard.h>  #include <tqevent.h>  #include <tqlabel.h> 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 <tqlabel.h> -#include <clipboard.h> +#include <tqclipboard.h>  #include <kmainwindow.h>  #include <klocale.h>  | 
