Rename KStandard for enhanced compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 33d5dbc743
commit 78941471d4

@ -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 )

@ -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/" ) )

@ -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 ) {

Loading…
Cancel
Save