From e16e56183f59220a2247d5c4d3dc915bd0520234 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:50:16 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- src/electronics/components/addac.cpp | 2 +- src/electronics/components/bidirled.cpp | 2 +- src/electronics/components/binarycounter.cpp | 2 +- src/electronics/components/bussplitter.cpp | 2 +- src/electronics/components/demultiplexer.cpp | 2 +- src/electronics/components/dependentsource.cpp | 2 +- src/electronics/components/discretelogic.cpp | 2 +- src/electronics/components/ec555.cpp | 2 +- src/electronics/components/ecbcdto7segment.cpp | 2 +- src/electronics/components/ecbjt.cpp | 2 +- src/electronics/components/eccapacitor.cpp | 2 +- src/electronics/components/ecclockinput.cpp | 2 +- src/electronics/components/eccurrentsignal.cpp | 2 +- src/electronics/components/eccurrentsource.cpp | 2 +- src/electronics/components/ecdiode.cpp | 2 +- src/electronics/components/ecfixedvoltage.cpp | 2 +- src/electronics/components/ecground.cpp | 2 +- src/electronics/components/eckeypad.cpp | 2 +- src/electronics/components/ecled.cpp | 2 +- src/electronics/components/ecopamp.cpp | 2 +- src/electronics/components/ecpotentiometer.cpp | 2 +- src/electronics/components/ecresistor.cpp | 2 +- src/electronics/components/ecsevensegment.cpp | 2 +- src/electronics/components/ecsignallamp.cpp | 2 +- src/electronics/components/ecsubcircuit.cpp | 2 +- src/electronics/components/ecvoltagesignal.cpp | 2 +- src/electronics/components/ecvoltagesource.cpp | 2 +- src/electronics/components/externalconnection.cpp | 2 +- src/electronics/components/flipflop.cpp | 2 +- src/electronics/components/fulladder.cpp | 2 +- src/electronics/components/inductor.cpp | 2 +- src/electronics/components/magnitudecomparator.cpp | 2 +- src/electronics/components/matrixdisplay.cpp | 2 +- src/electronics/components/matrixdisplaydriver.cpp | 2 +- src/electronics/components/meter.cpp | 2 +- src/electronics/components/multiinputgate.cpp | 2 +- src/electronics/components/multiplexer.cpp | 2 +- src/electronics/components/parallelportcomponent.cpp | 2 +- src/electronics/components/piccomponent.cpp | 4 ++-- src/electronics/components/probe.cpp | 2 +- src/electronics/components/pushswitch.cpp | 2 +- src/electronics/components/ram.cpp | 2 +- src/electronics/components/resistordip.cpp | 2 +- src/electronics/components/rotoswitch.cpp | 2 +- src/electronics/components/serialportcomponent.cpp | 2 +- src/electronics/components/toggleswitch.cpp | 2 +- src/electronics/gpsimprocessor.cpp | 6 +++--- 47 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src/electronics') diff --git a/src/electronics/components/addac.cpp b/src/electronics/components/addac.cpp index f1f7a92..afed135 100644 --- a/src/electronics/components/addac.cpp +++ b/src/electronics/components/addac.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include Item* ADC::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/bidirled.cpp b/src/electronics/components/bidirled.cpp index 50e7052..4e1ac95 100644 --- a/src/electronics/components/bidirled.cpp +++ b/src/electronics/components/bidirled.cpp @@ -16,7 +16,7 @@ #include "libraryitem.h" #include "simulator.h" -#include +#include #include Item* BiDirLED::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/binarycounter.cpp b/src/electronics/components/binarycounter.cpp index a93a1b2..04088e6 100644 --- a/src/electronics/components/binarycounter.cpp +++ b/src/electronics/components/binarycounter.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include Item* BinaryCounter::construct( ItemDocument *itemDocument, bool newItem, const char *id ) { diff --git a/src/electronics/components/bussplitter.cpp b/src/electronics/components/bussplitter.cpp index 6eb58e8..4c18dec 100644 --- a/src/electronics/components/bussplitter.cpp +++ b/src/electronics/components/bussplitter.cpp @@ -13,7 +13,7 @@ #include "libraryitem.h" #include "wire.h" -#include +#include #include Item* BusSplitter::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/demultiplexer.cpp b/src/electronics/components/demultiplexer.cpp index 7124c89..f757f3d 100644 --- a/src/electronics/components/demultiplexer.cpp +++ b/src/electronics/components/demultiplexer.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include #include diff --git a/src/electronics/components/dependentsource.cpp b/src/electronics/components/dependentsource.cpp index 1808c86..d0a3b37 100644 --- a/src/electronics/components/dependentsource.cpp +++ b/src/electronics/components/dependentsource.cpp @@ -18,7 +18,7 @@ #include "vccs.h" #include "vcvs.h" -#include +#include #include //BEGIN class DependentSource diff --git a/src/electronics/components/discretelogic.cpp b/src/electronics/components/discretelogic.cpp index 0c26e78..f850208 100644 --- a/src/electronics/components/discretelogic.cpp +++ b/src/electronics/components/discretelogic.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "simulator.h" -#include +#include #include diff --git a/src/electronics/components/ec555.cpp b/src/electronics/components/ec555.cpp index 2b5b9db..4ef2215 100644 --- a/src/electronics/components/ec555.cpp +++ b/src/electronics/components/ec555.cpp @@ -16,7 +16,7 @@ #include "resistance.h" #include -#include +#include #include Item* EC555::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecbcdto7segment.cpp b/src/electronics/components/ecbcdto7segment.cpp index f618a8e..f68d1f7 100644 --- a/src/electronics/components/ecbcdto7segment.cpp +++ b/src/electronics/components/ecbcdto7segment.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include // Values for a,b,c,d,e,f,g of common-anode 7 segment display bool numbers[16][7] = diff --git a/src/electronics/components/ecbjt.cpp b/src/electronics/components/ecbjt.cpp index aed928e..6ea97a8 100644 --- a/src/electronics/components/ecbjt.cpp +++ b/src/electronics/components/ecbjt.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include #include Item * ECBJT::constructNPN( ItemDocument * itemDocument, bool newItem, const char * id ) diff --git a/src/electronics/components/eccapacitor.cpp b/src/electronics/components/eccapacitor.cpp index c951291..5173d65 100644 --- a/src/electronics/components/eccapacitor.cpp +++ b/src/electronics/components/eccapacitor.cpp @@ -13,7 +13,7 @@ #include "ecnode.h" #include "libraryitem.h" -#include +#include #include Item* ECCapacitor::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecclockinput.cpp b/src/electronics/components/ecclockinput.cpp index 7d3d608..70e3855 100644 --- a/src/electronics/components/ecclockinput.cpp +++ b/src/electronics/components/ecclockinput.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include "simulator.h" -#include +#include #include #include diff --git a/src/electronics/components/eccurrentsignal.cpp b/src/electronics/components/eccurrentsignal.cpp index 14c632b..c11aab3 100644 --- a/src/electronics/components/eccurrentsignal.cpp +++ b/src/electronics/components/eccurrentsignal.cpp @@ -15,7 +15,7 @@ #include "pin.h" #include "simulator.h" -#include +#include #include Item* ECCurrentSignal::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/eccurrentsource.cpp b/src/electronics/components/eccurrentsource.cpp index 88c61da..cbd97f6 100644 --- a/src/electronics/components/eccurrentsource.cpp +++ b/src/electronics/components/eccurrentsource.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "pin.h" -#include +#include #include Item* ECCurrentSource::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecdiode.cpp b/src/electronics/components/ecdiode.cpp index 744f27e..0098cc6 100644 --- a/src/electronics/components/ecdiode.cpp +++ b/src/electronics/components/ecdiode.cpp @@ -13,7 +13,7 @@ #include "ecnode.h" #include "libraryitem.h" -#include +#include #include Item* ECDiode::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecfixedvoltage.cpp b/src/electronics/components/ecfixedvoltage.cpp index fa21dfe..96df9f2 100644 --- a/src/electronics/components/ecfixedvoltage.cpp +++ b/src/electronics/components/ecfixedvoltage.cpp @@ -14,7 +14,7 @@ #include "voltagepoint.h" #include "libraryitem.h" -#include +#include #include Item* ECFixedVoltage::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecground.cpp b/src/electronics/components/ecground.cpp index 68bf7e2..3eebb1e 100644 --- a/src/electronics/components/ecground.cpp +++ b/src/electronics/components/ecground.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include "pin.h" -#include +#include #include Item* ECGround::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/eckeypad.cpp b/src/electronics/components/eckeypad.cpp index 4a0ec7b..b50c810 100644 --- a/src/electronics/components/eckeypad.cpp +++ b/src/electronics/components/eckeypad.cpp @@ -14,7 +14,7 @@ #include "switch.h" #include "ecnode.h" -#include +#include Item* ECKeyPad::construct( ItemDocument *itemDocument, bool newItem, const char *id ) { diff --git a/src/electronics/components/ecled.cpp b/src/electronics/components/ecled.cpp index 4943621..b50744e 100644 --- a/src/electronics/components/ecled.cpp +++ b/src/electronics/components/ecled.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "simulator.h" -#include +#include #include Item* ECLed::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecopamp.cpp b/src/electronics/components/ecopamp.cpp index 04ed81f..341bd82 100644 --- a/src/electronics/components/ecopamp.cpp +++ b/src/electronics/components/ecopamp.cpp @@ -13,7 +13,7 @@ #include "ecnode.h" #include "libraryitem.h" -#include +#include #include Item* ECOpAmp::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp index 460ac4e..d775634 100644 --- a/src/electronics/components/ecpotentiometer.cpp +++ b/src/electronics/components/ecpotentiometer.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include "resistance.h" -#include +#include #include #include diff --git a/src/electronics/components/ecresistor.cpp b/src/electronics/components/ecresistor.cpp index e03be7b..3d3e703 100644 --- a/src/electronics/components/ecresistor.cpp +++ b/src/electronics/components/ecresistor.cpp @@ -13,7 +13,7 @@ #include "libraryitem.h" #include "resistance.h" -#include +#include #include Item* ECResistor::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecsevensegment.cpp b/src/electronics/components/ecsevensegment.cpp index e68bf7c..8037517 100644 --- a/src/electronics/components/ecsevensegment.cpp +++ b/src/electronics/components/ecsevensegment.cpp @@ -16,7 +16,7 @@ #include "libraryitem.h" #include "simulator.h" -#include +#include #include #include diff --git a/src/electronics/components/ecsignallamp.cpp b/src/electronics/components/ecsignallamp.cpp index 0a25c39..59b867b 100644 --- a/src/electronics/components/ecsignallamp.cpp +++ b/src/electronics/components/ecsignallamp.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "pin.h" -#include +#include #include Item* ECSignalLamp::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecsubcircuit.cpp b/src/electronics/components/ecsubcircuit.cpp index c897f02..b5fd799 100644 --- a/src/electronics/components/ecsubcircuit.cpp +++ b/src/electronics/components/ecsubcircuit.cpp @@ -16,7 +16,7 @@ #include "subcircuits.h" #include -#include +#include #include Item* ECSubcircuit::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/ecvoltagesignal.cpp b/src/electronics/components/ecvoltagesignal.cpp index 1590766..d972199 100644 --- a/src/electronics/components/ecvoltagesignal.cpp +++ b/src/electronics/components/ecvoltagesignal.cpp @@ -15,7 +15,7 @@ #include "simulator.h" #include "voltagesignal.h" -#include +#include #include const double conductance = 1e5; // Internal resistance diff --git a/src/electronics/components/ecvoltagesource.cpp b/src/electronics/components/ecvoltagesource.cpp index 9090b3b..ce16fe8 100644 --- a/src/electronics/components/ecvoltagesource.cpp +++ b/src/electronics/components/ecvoltagesource.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "pin.h" -#include +#include #include const double conductance = 1e5; // Internal resistance diff --git a/src/electronics/components/externalconnection.cpp b/src/electronics/components/externalconnection.cpp index ca89240..ae19044 100644 --- a/src/electronics/components/externalconnection.cpp +++ b/src/electronics/components/externalconnection.cpp @@ -11,7 +11,7 @@ #include "externalconnection.h" #include "libraryitem.h" -#include +#include #include Item* ExternalConnection::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/flipflop.cpp b/src/electronics/components/flipflop.cpp index 9bceb4d..5bde526 100644 --- a/src/electronics/components/flipflop.cpp +++ b/src/electronics/components/flipflop.cpp @@ -16,7 +16,7 @@ #include "simulator.h" #include -#include +#include #include diff --git a/src/electronics/components/fulladder.cpp b/src/electronics/components/fulladder.cpp index 3c71210..0cf55d6 100644 --- a/src/electronics/components/fulladder.cpp +++ b/src/electronics/components/fulladder.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include Item* FullAdder::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/inductor.cpp b/src/electronics/components/inductor.cpp index 5949a3b..3790fcb 100644 --- a/src/electronics/components/inductor.cpp +++ b/src/electronics/components/inductor.cpp @@ -12,7 +12,7 @@ #include "inductor.h" #include "libraryitem.h" -#include +#include #include Item* Inductor::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/magnitudecomparator.cpp b/src/electronics/components/magnitudecomparator.cpp index bae9b12..dacf9f7 100644 --- a/src/electronics/components/magnitudecomparator.cpp +++ b/src/electronics/components/magnitudecomparator.cpp @@ -13,7 +13,7 @@ #include "variant.h" #include -#include +#include Item* MagnitudeComparator::construct( ItemDocument *itemDocument, bool newItem, const char *id ) { diff --git a/src/electronics/components/matrixdisplay.cpp b/src/electronics/components/matrixdisplay.cpp index 4ba3dc6..3eb9fdd 100644 --- a/src/electronics/components/matrixdisplay.cpp +++ b/src/electronics/components/matrixdisplay.cpp @@ -17,7 +17,7 @@ #include "simulator.h" #include -#include +#include #include #include diff --git a/src/electronics/components/matrixdisplaydriver.cpp b/src/electronics/components/matrixdisplaydriver.cpp index a25bb7a..578445f 100644 --- a/src/electronics/components/matrixdisplaydriver.cpp +++ b/src/electronics/components/matrixdisplaydriver.cpp @@ -12,7 +12,7 @@ #include "logic.h" #include "matrixdisplaydriver.h" -#include +#include #include #include diff --git a/src/electronics/components/meter.cpp b/src/electronics/components/meter.cpp index fc021a6..9d9290f 100644 --- a/src/electronics/components/meter.cpp +++ b/src/electronics/components/meter.cpp @@ -19,7 +19,7 @@ #include "simulator.h" #include -#include +#include #include diff --git a/src/electronics/components/multiinputgate.cpp b/src/electronics/components/multiinputgate.cpp index c06d982..5359292 100644 --- a/src/electronics/components/multiinputgate.cpp +++ b/src/electronics/components/multiinputgate.cpp @@ -15,7 +15,7 @@ #include "logic.h" #include -#include +#include #include //BEGIN class MultiInputGate diff --git a/src/electronics/components/multiplexer.cpp b/src/electronics/components/multiplexer.cpp index a8770e4..e48d33d 100644 --- a/src/electronics/components/multiplexer.cpp +++ b/src/electronics/components/multiplexer.cpp @@ -14,7 +14,7 @@ #include "libraryitem.h" #include -#include +#include #include diff --git a/src/electronics/components/parallelportcomponent.cpp b/src/electronics/components/parallelportcomponent.cpp index 6126c1e..74c7c95 100644 --- a/src/electronics/components/parallelportcomponent.cpp +++ b/src/electronics/components/parallelportcomponent.cpp @@ -18,7 +18,7 @@ #include "resistance.h" #include -#include +#include #include #include diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp index 0712992..9ee429d 100644 --- a/src/electronics/components/piccomponent.cpp +++ b/src/electronics/components/piccomponent.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/electronics/components/probe.cpp b/src/electronics/components/probe.cpp index 1915d51..dfe29fd 100644 --- a/src/electronics/components/probe.cpp +++ b/src/electronics/components/probe.cpp @@ -18,7 +18,7 @@ #include "simulator.h" #include "voltagesource.h" -#include +#include #include //BEGIN class Probe diff --git a/src/electronics/components/pushswitch.cpp b/src/electronics/components/pushswitch.cpp index 8257440..5b926d6 100644 --- a/src/electronics/components/pushswitch.cpp +++ b/src/electronics/components/pushswitch.cpp @@ -13,7 +13,7 @@ #include "pushswitch.h" #include "switch.h" -#include +#include #include #include #include diff --git a/src/electronics/components/ram.cpp b/src/electronics/components/ram.cpp index d0ac2b1..375bf21 100644 --- a/src/electronics/components/ram.cpp +++ b/src/electronics/components/ram.cpp @@ -14,7 +14,7 @@ #include "variant.h" #include -#include +#include Item* RAM::construct( ItemDocument *itemDocument, bool newItem, const char *id ) { diff --git a/src/electronics/components/resistordip.cpp b/src/electronics/components/resistordip.cpp index 3ff030c..b5c75c9 100644 --- a/src/electronics/components/resistordip.cpp +++ b/src/electronics/components/resistordip.cpp @@ -14,7 +14,7 @@ #include "resistordip.h" #include -#include +#include #include Item* ResistorDIP::construct( ItemDocument *itemDocument, bool newItem, const char *id ) diff --git a/src/electronics/components/rotoswitch.cpp b/src/electronics/components/rotoswitch.cpp index 738942b..96a7681 100644 --- a/src/electronics/components/rotoswitch.cpp +++ b/src/electronics/components/rotoswitch.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "switch.h" -#include +#include #include #include #include diff --git a/src/electronics/components/serialportcomponent.cpp b/src/electronics/components/serialportcomponent.cpp index 4e3a221..e59b80c 100644 --- a/src/electronics/components/serialportcomponent.cpp +++ b/src/electronics/components/serialportcomponent.cpp @@ -18,7 +18,7 @@ #include "resistance.h" #include -#include +#include #include #include diff --git a/src/electronics/components/toggleswitch.cpp b/src/electronics/components/toggleswitch.cpp index 7c877f9..3d11ea6 100644 --- a/src/electronics/components/toggleswitch.cpp +++ b/src/electronics/components/toggleswitch.cpp @@ -15,7 +15,7 @@ #include "libraryitem.h" #include "switch.h" -#include +#include #include //BEGIN class ECDPDT diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index 2b45da7..587fc6f 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include -- cgit v1.2.1