diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:26 -0600 |
| commit | 3a5959381ad8f19244d717520a23ec5905b69bec (patch) | |
| tree | 7c5a3172a6f7ddb64abe032f3139c858a6effb13 | |
| parent | eb2f7a1d121f6812aa3f7cf4f45490a5efcd96a1 (diff) | |
| download | kbarcode-3a5959381ad8f19244d717520a23ec5905b69bec.tar.gz kbarcode-3a5959381ad8f19244d717520a23ec5905b69bec.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | kbarcode/kbarcode.cpp | 2 | ||||
| -rw-r--r-- | kbarcode/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp index 02dc92c..9c7f6b8 100644 --- a/kbarcode/kbarcode.cpp +++ b/kbarcode/kbarcode.cpp @@ -154,7 +154,7 @@ bool KBarcode::parseCmdLine() { enum { BARCODE, LABEL, BATCH, NONE } mode = NONE; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); BatchPrinter::EOutputFormat eFormat = BatchPrinter::POSTSCRIPT; LabelEditor* pEdit = NULL; diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp index 30378ef..bc4a316 100644 --- a/kbarcode/main.cpp +++ b/kbarcode/main.cpp @@ -102,8 +102,8 @@ int main(int argc, char *argv[]) aboutData.addCredit("John Volpe", I18N_NOOP("Added lot's of useful data fields to kbarcode"), "[email protected]" ); aboutData.addCredit("Nyssa s.r.l.", I18N_NOOP("Added TEC barcode printer support"), "[email protected]", "http://www.nyssa.com.ar" ); aboutData.addCredit("Brian Glass", I18N_NOOP("Added EPCL barcode printer support"), "[email protected]", "http://www.glassbrian.com" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; // setup standard dirs |