diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:57 -0600 |
| commit | 1ec2b02ce0ccbeb2e21fb194c5be15e5a1accbd4 (patch) | |
| tree | 428684671c709ef46b0e6449c53e129baf55660b /kbarcode/measurements.cpp | |
| parent | 2fcd57bd0e32874f3a2fd3022a2a7f8d30c92163 (diff) | |
| download | kbarcode-1ec2b02ce0ccbeb2e21fb194c5be15e5a1accbd4.tar.gz kbarcode-1ec2b02ce0ccbeb2e21fb194c5be15e5a1accbd4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kbarcode/measurements.cpp')
| -rw-r--r-- | kbarcode/measurements.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kbarcode/measurements.cpp b/kbarcode/measurements.cpp index a945406..84712d6 100644 --- a/kbarcode/measurements.cpp +++ b/kbarcode/measurements.cpp @@ -46,10 +46,10 @@ TQString Measurements::m_string = TQString(); void Measurements::init() { if( m_system == None ) { - m_system = KGlobal::locale()->measureSystem(); + m_system = TDEGlobal::locale()->measureSystem(); m_string = (m_system == Metric) ? - KGlobal::staticQString( i18n("mm" ) ) : - KGlobal::staticQString( i18n("in" ) ); + TDEGlobal::staticQString( i18n("mm" ) ) : + TDEGlobal::staticQString( i18n("in" ) ); } } |