diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:16:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:16:44 -0600 |
| commit | 78941471d4da824445ef9a8089245314f60709b7 (patch) | |
| tree | 770127cd57bfc04dfb9c01ac9f425b7219f23018 /kbarcode | |
| parent | 33d5dbc7435d1a86ed31deef2e0fe76ae57ca04f (diff) | |
| download | kbarcode-78941471d4da824445ef9a8089245314f60709b7.tar.gz kbarcode-78941471d4da824445ef9a8089245314f60709b7.zip | |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'kbarcode')
| -rw-r--r-- | kbarcode/barkode.cpp | 10 | ||||
| -rw-r--r-- | kbarcode/main.cpp | 2 | ||||
| -rw-r--r-- | kbarcode/mybarcode.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kbarcode/barkode.cpp b/kbarcode/barkode.cpp index b54592f..7aa2332 100644 --- a/kbarcode/barkode.cpp +++ b/kbarcode/barkode.cpp @@ -683,12 +683,12 @@ void Barkode::initInfo() PurePostscriptBarcode::init(); - s_haveGnuBarcode = !KStandardDirs::findExe( "barcode" ).isNull(); - s_havePdfEncode = !KStandardDirs::findExe( "pdf417_enc" ).isNull(); - s_haveTBarcode = false; //!KStandardDirs::findExe( "tbarcodeclient" ).isNull(); + s_haveGnuBarcode = !TDEStandardDirs::findExe( "barcode" ).isNull(); + s_havePdfEncode = !TDEStandardDirs::findExe( "pdf417_enc" ).isNull(); + s_haveTBarcode = false; //!TDEStandardDirs::findExe( "tbarcodeclient" ).isNull(); // TODO: do not yet enable TBarcode2 support - s_haveTBarcode2 = !KStandardDirs::findExe( "tbarcode" ).isNull(); - s_havePurePostscript = !KStandardDirs::findExe( "gs" ).isNull() + s_haveTBarcode2 = !TDEStandardDirs::findExe( "tbarcode" ).isNull(); + s_havePurePostscript = !TDEStandardDirs::findExe( "gs" ).isNull() && PurePostscriptBarcode::hasPurePostscriptBarcode(); if( s_haveGnuBarcode ) diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp index 59cbf93..9541548 100644 --- a/kbarcode/main.cpp +++ b/kbarcode/main.cpp @@ -54,7 +54,7 @@ void setupDirs() { if( locate("data", "kbarcode/logo.png").isEmpty() ) { // Maybe KBarcode was not installed into $TDEDIR - KStandardDirs* dirs = TDEGlobal::dirs(); + TDEStandardDirs* dirs = TDEGlobal::dirs(); TQString tdedir = dirs->kfsstnd_prefixes(); if( !tdedir.contains( "/usr/local/" ) ) diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp index 50f9bd8..868b20d 100644 --- a/kbarcode/mybarcode.cpp +++ b/kbarcode/mybarcode.cpp @@ -528,9 +528,9 @@ barcodeFormat BarCode::fillStruct( const TQString & name, const TQString & text, void BarCode::setHaveBarcode() { - m_haveGnuBarcode = !KStandardDirs::findExe( "barcode" ).isNull(); - m_havePdfEncode = !KStandardDirs::findExe( "pdf417_enc" ).isNull(); - m_haveTBarcode = !KStandardDirs::findExe( "tbarcodeclient" ).isNull(); + m_haveGnuBarcode = !TDEStandardDirs::findExe( "barcode" ).isNull(); + m_havePdfEncode = !TDEStandardDirs::findExe( "pdf417_enc" ).isNull(); + m_haveTBarcode = !TDEStandardDirs::findExe( "tbarcodeclient" ).isNull(); if( codes.count() == 0 ) { if( m_haveGnuBarcode ) { |