diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeprint/foomatic2loader.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/foomatic2loader.cpp')
| -rw-r--r-- | kdeprint/foomatic2loader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp index 2e00feae3..4ca1464dd 100644 --- a/kdeprint/foomatic2loader.cpp +++ b/kdeprint/foomatic2loader.cpp @@ -141,7 +141,7 @@ DrMain* Foomatic2Loader::buildDriver() const if ( m_foodata.isEmpty() ) return NULL; - TQVariant v = m_foodata.tqfind( "VAR" ).data(); + TQVariant v = m_foodata.find( "VAR" ).data(); if ( !v.isNull() && v.type() == TQVariant::Map ) { DrMain *driver = new DrMain; @@ -151,8 +151,8 @@ DrMain* Foomatic2Loader::buildDriver() const driver->set( "matic_printer", v.mapFind( "id" ).data().toString() ); driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() ); driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) ); - if ( m_foodata.tqcontains( "POSTPIPE" ) ) - driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() ); + if ( m_foodata.contains( "POSTPIPE" ) ) + driver->set( "postpipe", m_foodata.find( "POSTPIPE" ).data().toString() ); v = v.mapFind( "args" ).data(); if ( !v.isNull() && v.type() == TQVariant::List ) { @@ -166,7 +166,7 @@ DrMain* Foomatic2Loader::buildDriver() const { TQString group = DrGroup::groupForOption( opt->name() ); DrGroup *grp = NULL; - if ( !groups.tqcontains( group ) ) + if ( !groups.contains( group ) ) { grp = new DrGroup; grp->set( "text", group ); @@ -211,7 +211,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const TQValueList<DrBase*> optList; DrGroup *grp = NULL; - TQVariant V = m_foodata.tqfind( "VAR" ).data(); + TQVariant V = m_foodata.find( "VAR" ).data(); if ( !V.isNull() && V.type() == TQVariant::Map ) { TQVariant v = V.mapFind( "args" ).data(); @@ -268,7 +268,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const grp->set( "text", i18n( "Adjustments" ) ); driver->addGroup( grp ); } - DrBase *oldOpt = driver->tqfindOption( opt->name() ); + DrBase *oldOpt = driver->findOption( opt->name() ); if ( oldOpt && oldOpt->type() == DrBase::List ) { TQPtrListIterator<DrBase> it( *( static_cast<DrListOption*>( oldOpt )->choices() ) ); |