Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 2fcd57bd0e
commit 1ec2b02ce0

@ -25,15 +25,15 @@
EncodingCombo::EncodingCombo( TQWidget* parent ) EncodingCombo::EncodingCombo( TQWidget* parent )
: KComboBox( parent ) : KComboBox( parent )
{ {
TQString sEncoding = TQString( KGlobal::locale()->encoding() ); TQString sEncoding = TQString( TDEGlobal::locale()->encoding() );
TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames());
this->insertStringList( encodings ); this->insertStringList( encodings );
for (int i=0; i < encodings.count(); i++) for (int i=0; i < encodings.count(); i++)
{ {
bool found = false; bool found = false;
TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found);
if (found && ( (codecForEnc->name() == sEncoding) || (encodings[i] == sEncoding) ) ) if (found && ( (codecForEnc->name() == sEncoding) || (encodings[i] == sEncoding) ) )
{ {
this->setCurrentItem(i); this->setCurrentItem(i);

@ -54,7 +54,7 @@ void setupDirs()
{ {
if( locate("data", "kbarcode/logo.png").isEmpty() ) { if( locate("data", "kbarcode/logo.png").isEmpty() ) {
// Maybe KBarcode was not installed into $TDEDIR // Maybe KBarcode was not installed into $TDEDIR
KStandardDirs* dirs = KGlobal::dirs(); KStandardDirs* dirs = TDEGlobal::dirs();
TQString tdedir = dirs->kfsstnd_prefixes(); TQString tdedir = dirs->kfsstnd_prefixes();
if( !tdedir.contains( "/usr/local/" ) ) if( !tdedir.contains( "/usr/local/" ) )

@ -46,10 +46,10 @@ TQString Measurements::m_string = TQString();
void Measurements::init() void Measurements::init()
{ {
if( m_system == None ) { if( m_system == None ) {
m_system = KGlobal::locale()->measureSystem(); m_system = TDEGlobal::locale()->measureSystem();
m_string = (m_system == Metric) ? m_string = (m_system == Metric) ?
KGlobal::staticQString( i18n("mm" ) ) : TDEGlobal::staticQString( i18n("mm" ) ) :
KGlobal::staticQString( i18n("in" ) ); TDEGlobal::staticQString( i18n("in" ) );
} }
} }

@ -117,7 +117,7 @@ bool BarCode::createPixmap( TQPixmap* target, int resx, int resy )
<< "-b" << KShellProcess::quote( m_value ) << flag << "-b" << KShellProcess::quote( m_value ) << flag
<< "-e" << barcode.type << "-o" << output->name(); << "-e" << barcode.type << "-o" << output->name();
proc.start( KProcess::Block, KProcess::NoCommunication ); proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
proc.resume(); proc.resume();
if( proc.exitStatus() ) { if( proc.exitStatus() ) {
@ -143,7 +143,7 @@ bool BarCode::createPixmap( TQPixmap* target, int resx, int resy )
<< "-sDEVICE=pbmraw" << "-sOutputFile=" + input->name() << "-sNOPAUSE" << "-sDEVICE=pbmraw" << "-sOutputFile=" + input->name() << "-sNOPAUSE"
<< "-q " + output->name() << "-c showpage" << "-c quit"; << "-q " + output->name() << "-c showpage" << "-c quit";
proc2.start( KProcess::Block, KProcess::NoCommunication ); proc2.start( TDEProcess::Block, TDEProcess::NoCommunication );
proc2.resume(); proc2.resume();
if( proc2.exitStatus() ) { if( proc2.exitStatus() ) {
@ -220,7 +220,7 @@ bool BarCode::createPdf417( KTempFile* output )
<< barcode.pdf417.col << barcode.pdf417.col
<< barcode.pdf417.err; << barcode.pdf417.err;
proc.start( KProcess::Block, KProcess::NoCommunication ); proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
proc.resume(); proc.resume();
if( proc.exitStatus() ) { if( proc.exitStatus() ) {
@ -257,7 +257,7 @@ bool BarCode::createTBarcode( KTempFile* output )
.arg( barcode.pdf417.err ); .arg( barcode.pdf417.err );
proc << barcode.type << "tPS" << TQString("c%1").arg( barcode.tbarcode.checksum ) << flag << "d" + KShellProcess::quote( m_value ); proc << barcode.type << "tPS" << TQString("c%1").arg( barcode.tbarcode.checksum ) << flag << "d" + KShellProcess::quote( m_value );
proc.start( KProcess::Block, KProcess::NoCommunication ); proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
proc.resume(); proc.resume();
if( proc.exitStatus() ) if( proc.exitStatus() )

@ -141,7 +141,7 @@ typedef struct barcodeFormat {
unsigned int features; unsigned int features;
}; };
class KProcess; class TDEProcess;
class KTempFile; class KTempFile;
class TQPaintDevice; class TQPaintDevice;
/** /**

@ -370,7 +370,7 @@ bool PixmapBarcode::createPdf417( KTempFile* output )
<< options->col() << options->col()
<< options->err(); << options->err();
proc.start( KProcess::Block, KProcess::NoCommunication ); proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
proc.resume(); proc.resume();
if( proc.exitStatus() ) { if( proc.exitStatus() ) {

@ -119,7 +119,7 @@ void PrinterSettings::loadConfig()
// get default page size from KDE // get default page size from KDE
if( lpdata->format == -1 ) if( lpdata->format == -1 )
for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( PageFormatInfo ); i++ ) for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( PageFormatInfo ); i++ )
if( pageFormatInfo[i].kprinter == KGlobal::locale()->pageSize() ) { if( pageFormatInfo[i].kprinter == TDEGlobal::locale()->pageSize() ) {
lpdata->format = i; lpdata->format = i;
break; break;
} }

Loading…
Cancel
Save