From faa9ae7ea5df8b3bf83134b98c4b9c5a444c13ef Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 2 Aug 2011 20:31:31 +0000 Subject: [PATCH] Fix ktechlab FTBFS under gcc4.6 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1244446 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/electronics/components/discretelogic.cpp | 6 +++--- src/electronics/components/ec555.cpp | 2 +- src/electronics/components/ecbcdto7segment.cpp | 2 +- src/electronics/components/eccurrentsource.cpp | 2 +- src/electronics/components/ecground.cpp | 2 +- src/electronics/components/ecled.cpp | 2 +- src/electronics/components/ecsubcircuit.cpp | 2 +- src/electronics/components/flipflop.cpp | 4 ++-- src/electronics/components/multiinputgate.cpp | 10 +++++----- src/flowparts/count.cpp | 2 +- src/flowparts/delay.cpp | 2 +- src/flowparts/embed.cpp | 2 +- src/flowparts/pulse.cpp | 2 +- src/flowparts/start.cpp | 2 +- src/flowparts/varassignment.cpp | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/electronics/components/discretelogic.cpp b/src/electronics/components/discretelogic.cpp index 03f4468..0c26e78 100644 --- a/src/electronics/components/discretelogic.cpp +++ b/src/electronics/components/discretelogic.cpp @@ -93,7 +93,7 @@ Item* Buffer::construct( ItemDocument *itemDocument, bool newItem, const char *i LibraryItem* Buffer::libraryItem() { return new LibraryItem( - TQString::TQString("ec/buffer"), + TQString("ec/buffer"), i18n("Buffer"), i18n("Logic"), "buffer.png", @@ -155,7 +155,7 @@ Item* ECLogicInput::construct( ItemDocument *itemDocument, bool newItem, const c LibraryItem* ECLogicInput::libraryItem() { return new LibraryItem( - TQString::TQString("ec/logic_input"), + TQString("ec/logic_input"), i18n("Logic Input"), i18n("Logic"), "logic_input.png", @@ -224,7 +224,7 @@ Item* ECLogicOutput::construct( ItemDocument *itemDocument, bool newItem, const LibraryItem* ECLogicOutput::libraryItem() { return new LibraryItem( - TQString::TQString("ec/logic_output"), + TQString("ec/logic_output"), i18n("Logic Output"), i18n("Logic"), "logic_output.png", diff --git a/src/electronics/components/ec555.cpp b/src/electronics/components/ec555.cpp index 3f43cb3..2b5b9db 100644 --- a/src/electronics/components/ec555.cpp +++ b/src/electronics/components/ec555.cpp @@ -27,7 +27,7 @@ Item* EC555::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* EC555::libraryItem() { return new LibraryItem( - TQString::TQString("ec/555"), + TQString("ec/555"), i18n("555"), i18n("Integrated Circuits"), "ic1.png", diff --git a/src/electronics/components/ecbcdto7segment.cpp b/src/electronics/components/ecbcdto7segment.cpp index b6a7dd8..f618a8e 100644 --- a/src/electronics/components/ecbcdto7segment.cpp +++ b/src/electronics/components/ecbcdto7segment.cpp @@ -43,7 +43,7 @@ Item* ECBCDTo7Segment::construct( ItemDocument *itemDocument, bool newItem, cons LibraryItem* ECBCDTo7Segment::libraryItem() { return new LibraryItem( - TQString::TQString("ec/bcd_to_seven_segment"), + TQString("ec/bcd_to_seven_segment"), i18n("BCD to 7 Segment"), i18n("Integrated Circuits"), "ic2.png", diff --git a/src/electronics/components/eccurrentsource.cpp b/src/electronics/components/eccurrentsource.cpp index 6184ef1..88c61da 100644 --- a/src/electronics/components/eccurrentsource.cpp +++ b/src/electronics/components/eccurrentsource.cpp @@ -26,7 +26,7 @@ Item* ECCurrentSource::construct( ItemDocument *itemDocument, bool newItem, cons LibraryItem* ECCurrentSource::libraryItem() { return new LibraryItem( - TQString::TQString("ec/current_source"), + TQString("ec/current_source"), i18n("Current Source"), i18n("Sources"), "current_source.png", diff --git a/src/electronics/components/ecground.cpp b/src/electronics/components/ecground.cpp index 2e98cfa..68bf7e2 100644 --- a/src/electronics/components/ecground.cpp +++ b/src/electronics/components/ecground.cpp @@ -24,7 +24,7 @@ Item* ECGround::construct( ItemDocument *itemDocument, bool newItem, const char LibraryItem* ECGround::libraryItem() { return new LibraryItem( - TQString::TQString("ec/ground"), + TQString("ec/ground"), i18n("Ground (0V)"), i18n("Sources"), "ground.png", diff --git a/src/electronics/components/ecled.cpp b/src/electronics/components/ecled.cpp index f7c5cca..4943621 100644 --- a/src/electronics/components/ecled.cpp +++ b/src/electronics/components/ecled.cpp @@ -26,7 +26,7 @@ Item* ECLed::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* ECLed::libraryItem() { return new LibraryItem( - TQString::TQString("ec/led"), + TQString("ec/led"), i18n("LED"), i18n("Outputs"), "led.png", diff --git a/src/electronics/components/ecsubcircuit.cpp b/src/electronics/components/ecsubcircuit.cpp index 8ae898c..c897f02 100644 --- a/src/electronics/components/ecsubcircuit.cpp +++ b/src/electronics/components/ecsubcircuit.cpp @@ -27,7 +27,7 @@ Item* ECSubcircuit::construct( ItemDocument *itemDocument, bool newItem, const c LibraryItem* ECSubcircuit::libraryItem() { return new LibraryItem( - TQString::TQString("ec/subcircuit"), + TQString("ec/subcircuit"), TQString(), TQString(), TQString(), diff --git a/src/electronics/components/flipflop.cpp b/src/electronics/components/flipflop.cpp index 69d983d..9bceb4d 100644 --- a/src/electronics/components/flipflop.cpp +++ b/src/electronics/components/flipflop.cpp @@ -141,7 +141,7 @@ Item* ECJKFlipFlop::construct( ItemDocument *itemDocument, bool newItem, const c LibraryItem* ECJKFlipFlop::libraryItem() { return new LibraryItem( - TQString::TQString("ec/jk_flipflop"), + TQString("ec/jk_flipflop"), i18n("JK Flip-Flop"), i18n("Integrated Circuits"), "ic3.png", @@ -243,7 +243,7 @@ Item* ECSRFlipFlop::construct( ItemDocument *itemDocument, bool newItem, const c LibraryItem* ECSRFlipFlop::libraryItem() { return new LibraryItem( - TQString::TQString("ec/sr_flipflop"), + TQString("ec/sr_flipflop"), i18n("SR Flip-Flop"), i18n("Integrated Circuits"), "ic3.png", diff --git a/src/electronics/components/multiinputgate.cpp b/src/electronics/components/multiinputgate.cpp index 6b76bde..7ebd6ce 100644 --- a/src/electronics/components/multiinputgate.cpp +++ b/src/electronics/components/multiinputgate.cpp @@ -144,7 +144,7 @@ Item* ECXnor::construct( ItemDocument *itemDocument, bool newItem, const char *i LibraryItem* ECXnor::libraryItem() { return new LibraryItem( - TQString::TQString("ec/xnor"), + TQString("ec/xnor"), i18n("XNOR gate"), i18n("Logic"), "xnor.png", @@ -216,7 +216,7 @@ Item* ECXor::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* ECXor::libraryItem() { return new LibraryItem( - TQString::TQString("ec/xor"), + TQString("ec/xor"), i18n("XOR gate"), i18n("Logic"), "xor.png", @@ -286,7 +286,7 @@ Item* ECOr::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* ECOr::libraryItem() { return new LibraryItem( - TQString::TQString("ec/or"), + TQString("ec/or"), i18n("OR gate"), i18n("Logic"), "or.png", @@ -357,7 +357,7 @@ Item* ECNor::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* ECNor::libraryItem() { return new LibraryItem( - TQString::TQString("ec/nor"), + TQString("ec/nor"), i18n("NOR gate"), i18n("Logic"), "nor.png", @@ -428,7 +428,7 @@ Item* ECNand::construct( ItemDocument *itemDocument, bool newItem, const char *i LibraryItem* ECNand::libraryItem() { return new LibraryItem( - TQString::TQString("ec/nand"), + TQString("ec/nand"), i18n("NAND gate"), i18n("Logic"), "nand.png", diff --git a/src/flowparts/count.cpp b/src/flowparts/count.cpp index 190ed80..2357fb8 100644 --- a/src/flowparts/count.cpp +++ b/src/flowparts/count.cpp @@ -23,7 +23,7 @@ Item* Count::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* Count::libraryItem() { return new LibraryItem( - TQString::TQString("flow/count"), + TQString("flow/count"), i18n("Count"), i18n("Functions"), "ppcount.png", diff --git a/src/flowparts/delay.cpp b/src/flowparts/delay.cpp index 5d42373..f31a0e9 100644 --- a/src/flowparts/delay.cpp +++ b/src/flowparts/delay.cpp @@ -23,7 +23,7 @@ Item* Delay::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* Delay::libraryItem() { return new LibraryItem( - TQString::TQString("flow/delay"), + TQString("flow/delay"), i18n("Delay"), i18n("Functions"), "delay.png", diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp index 996ce2f..f858747 100644 --- a/src/flowparts/embed.cpp +++ b/src/flowparts/embed.cpp @@ -23,7 +23,7 @@ Item* Embed::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* Embed::libraryItem() { return new LibraryItem( - TQString::TQString("flow/embed"), + TQString("flow/embed"), i18n("Embed"), i18n("Common"), "embed.png", diff --git a/src/flowparts/pulse.cpp b/src/flowparts/pulse.cpp index 4851abe..86e2239 100644 --- a/src/flowparts/pulse.cpp +++ b/src/flowparts/pulse.cpp @@ -22,7 +22,7 @@ Item* Pulse::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* Pulse::libraryItem() { return new LibraryItem( - TQString::TQString("flow/pulse"), + TQString("flow/pulse"), i18n("Pulse"), i18n("Functions"), "pppulse.png", diff --git a/src/flowparts/start.cpp b/src/flowparts/start.cpp index 4e88858..b365d14 100644 --- a/src/flowparts/start.cpp +++ b/src/flowparts/start.cpp @@ -23,7 +23,7 @@ Item* Start::construct( ItemDocument *itemDocument, bool newItem, const char *id LibraryItem* Start::libraryItem() { return new LibraryItem( - TQString::TQString("flow/start"), + TQString("flow/start"), i18n("Start"), i18n("Common"), "start.png", diff --git a/src/flowparts/varassignment.cpp b/src/flowparts/varassignment.cpp index 4156779..d40af61 100644 --- a/src/flowparts/varassignment.cpp +++ b/src/flowparts/varassignment.cpp @@ -23,7 +23,7 @@ Item* VarAssignment::construct( ItemDocument *itemDocument, bool newItem, const LibraryItem* VarAssignment::libraryItem() { return new LibraryItem( - TQString::TQString("flow/varassignment"), + TQString("flow/varassignment"), i18n("Assignment"), i18n("Variables"), "assignment.png",