diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-04 10:34:56 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-04 16:21:27 +0900 |
commit | 1a64436b9a43adc85a684bd9c9c6a3f2fe35f6fa (patch) | |
tree | 39880601acc95a292658245c3eb704b1e41138dc | |
parent | 84a8b220bfcb87ca91bd1c12e5c56beb57e4b042 (diff) | |
download | k9copy-1a64436b9a43adc85a684bd9c9c6a3f2fe35f6fa.tar.gz k9copy-1a64436b9a43adc85a684bd9c9c6a3f2fe35f6fa.zip |
Fix more usage of TQString which would cause FTBFS with cmake
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 94c81f01905087ff9bdc655b96f8ac92c647314e)
-rw-r--r-- | k9vamps/cputest.cpp | 4 | ||||
-rw-r--r-- | src/k9main.cpp | 2 | ||||
-rw-r--r-- | src/k9mencodercmdgen.cpp | 24 | ||||
-rw-r--r-- | src/k9play.cpp | 2 |
4 files changed, 19 insertions, 13 deletions
diff --git a/k9vamps/cputest.cpp b/k9vamps/cputest.cpp index 643742b..c26cd3e 100644 --- a/k9vamps/cputest.cpp +++ b/k9vamps/cputest.cpp @@ -5,9 +5,7 @@ #include <stdlib.h> #include "ac.h" -#ifdef HAVE_STRING_H -# include <string.h> -#endif +#include <string.h> #ifdef ARCH_X86_64 # define REG_b "rbx" diff --git a/src/k9main.cpp b/src/k9main.cpp index d8d78f8..5021917 100644 --- a/src/k9main.cpp +++ b/src/k9main.cpp @@ -1190,7 +1190,7 @@ void k9Main::extractMPEG2() { for (int i=0; i < dvd->gettitleCount();i++) { k9DVDTitle *t=dvd->gettitle(i); - changeStatusbar( i18n("Extracting title : %1",t->getname()) ,sbMessage); + changeStatusbar( i18n("Extracting title : %1").arg(t->getname()) ,sbMessage); if (t->isSelected() && t->getIndexed() ) { TQString name; diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp index 7961b11..938e30f 100644 --- a/src/k9mencodercmdgen.cpp +++ b/src/k9mencodercmdgen.cpp @@ -203,7 +203,8 @@ void k9MencoderCmdGen::addList(TQDomElement _eOpt) { bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").arg(m_row++) ); + TQCString ckLabelName = TQString("ck%1").arg(m_row++).utf8(); + TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,ckLabelName); ckLabel->setChecked(bSel); m_hbox=new TQGrid(2,m_grid); m_hbox->setFrameShape(TQFrame::StyledPanel); @@ -255,7 +256,8 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++) ); + TQCString ckLabelName = TQString("ck%1").arg(m_row++).utf8(); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,ckLabelName); ckLabel->setChecked(bSel); ckLabel->setBackgroundColor(parent->backgroundColor()); @@ -266,7 +268,8 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) { _eOpt.setAttribute("checkbox",ckLabel->name()); - KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").arg(m_row++)); + TQCString sbName = TQString("int%1").arg(m_row++).utf8(); + KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,sbName); if (iMax <1000) sb->setFixedWidth(50); else @@ -301,7 +304,8 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++)); + TQCString ckLabelName = TQString("ck%1").arg(m_row++).utf8(); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,ckLabelName); ckLabel->setChecked(bSel); if ( !_eOpt.attributeNode("description").isNull()) { TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); @@ -317,7 +321,8 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) { if (!_eOpt.attributeNode("precision").isNull()) { iPrecision=_eOpt.attributeNode("precision").value().toInt(); } - KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").arg(m_row++)); + TQCString sbName = TQString("float%1").arg(m_row++).utf8(); + KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,sbName); if (dMax <1000) sb->setFixedWidth(80); else @@ -346,7 +351,8 @@ void k9MencoderCmdGen::addBool(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++)); + TQCString ckLabelName = TQString("ck%1").arg(m_row++).utf8(); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,ckLabelName); if ( !_eOpt.attributeNode("description").isNull()) { TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); @@ -379,7 +385,8 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++)); + TQCString ckLabelName = TQString("ck%1").arg(m_row++).utf8(); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,ckLabelName); ckLabel->setChecked(bSel); if ( !_eOpt.attributeNode("description").isNull()) { TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); @@ -387,7 +394,8 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) { } _eOpt.setAttribute("checkbox",ckLabel->name()); - TQComboBox *cb=new TQComboBox(parent,TQString("string%1").arg(m_row++)); + TQCString cbName = TQString("string%1").arg(m_row++).utf8(); + TQComboBox *cb=new TQComboBox(parent,cbName); TQDomNodeList values=_eOpt.elementsByTagName("value"); int def=0; diff --git a/src/k9play.cpp b/src/k9play.cpp index 915df89..f4b6c4e 100644 --- a/src/k9play.cpp +++ b/src/k9play.cpp @@ -294,7 +294,7 @@ void k9play::play() { } /* open dvdnav handle */ - if (dvdnav_open(&dvdnav, m_device,NULL) != DVDNAV_STATUS_OK) { + if (dvdnav_open(&dvdnav, m_device.local8Bit(), NULL) != DVDNAV_STATUS_OK) { writeOutput("ERR:Error on dvdnav_open\n"); return ; } |