TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 5

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/247/head
Michele Calgaro 12 months ago
parent cca633c6bd
commit 44e712a770
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
47 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File

2
kdoctools/xslt.cpp
Unescape View File

@ -205,7 +205,7 @@ static TQIODevice *getBZip2device(const TQString &fileName )
if ( base ) if ( base )
{ {
base->setDevice(TQT_TQIODEVICE(f), true); base->setDevice(f, true);
return new KFilterDev(base, true); return new KFilterDev(base, true);
} }
return 0; return 0;

2
tdecore/tdesycoca.cpp
Unescape View File

@ -246,7 +246,7 @@ void KSycoca::closeDatabase()
delete m_str; delete m_str;
m_str = 0; m_str = 0;
delete device; delete device;
if (TQT_TQIODEVICE(d->database) != device) if (d->database != device)
delete d->database; delete d->database;
if (m_barray) delete m_barray; if (m_barray) delete m_barray;
m_barray = 0; m_barray = 0;

4
tdehtml/tdehtmlview.cpp
Unescape View File

@ -2951,7 +2951,7 @@ void TDEHTMLView::print(bool quick)
d->paged = false; d->paged = false;
tdehtml::setPrintPainter( 0 ); tdehtml::setPrintPainter( 0 );
setMediaType( oldMediaType ); setMediaType( oldMediaType );
m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); m_part->xmlDocImpl()->setPaintDevice( this );
m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor()); m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
m_part->xmlDocImpl()->updateStyleSelector(); m_part->xmlDocImpl()->updateStyleSelector();
viewport()->unsetCursor(); viewport()->unsetCursor();
@ -3002,7 +3002,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
root->setPagedMode(false); root->setPagedMode(false);
root->setStaticMode(false); root->setStaticMode(false);
m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); m_part->xmlDocImpl()->setPaintDevice( this );
} }

4
tdehtml/xml/dom_docimpl.cpp
Unescape View File

@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
if ( v ) { if ( v ) {
m_docLoader = new DocLoader(v->part(), this ); m_docLoader = new DocLoader(v->part(), this );
setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); setPaintDevice( m_view );
} }
else else
m_docLoader = new DocLoader( 0, this ); m_docLoader = new DocLoader( 0, this );
@ -1231,7 +1231,7 @@ void DocumentImpl::attach()
assert(!attached()); assert(!attached());
if ( m_view ) if ( m_view )
setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); setPaintDevice( m_view );
if (!m_renderArena) if (!m_renderArena)
m_renderArena.reset(new RenderArena()); m_renderArena.reset(new RenderArena());

8
tdeio/tdefile/kpropertiesdialog.cpp
Unescape View File

@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
grid->setColStretch(1, 0); grid->setColStretch(1, 0);
grid->setColStretch(2, 1); grid->setColStretch(2, 1);
grid->addColSpacing(1, KDialog::spacingHint()); grid->addColSpacing(1, KDialog::spacingHint());
vbl->addLayout(TQT_TQLAYOUT(grid)); vbl->addLayout(grid);
int curRow = 0; int curRow = 0;
if ( !d->bMultiple ) if ( !d->bMultiple )
@ -1733,7 +1733,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
"sense for programs and scripts. It is required when you want to " "sense for programs and scripts. It is required when you want to "
"execute them.")); "execute them."));
TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
gl->addMultiCell(spacer, 5, 5, 0, 1); gl->addMultiCell(spacer, 5, 5, 0, 1);
pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb);
@ -4002,7 +4002,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
TQGridLayout *grid = new TQGridLayout(2, 2); TQGridLayout *grid = new TQGridLayout(2, 2);
grid->setColStretch(1, 1); grid->setColStretch(1, 1);
toplayout->addLayout(TQT_TQLAYOUT(grid)); toplayout->addLayout(grid);
if ( d->m_kdesktopMode ) if ( d->m_kdesktopMode )
{ {
@ -4038,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
grid->setColStretch(2, 1); grid->setColStretch(2, 1);
grid->setRowStretch( 0, 1 ); grid->setRowStretch( 0, 1 );
grid->setRowStretch( 3, 1 ); grid->setRowStretch( 3, 1 );
toplayout->addLayout(TQT_TQLAYOUT(grid), 2); toplayout->addLayout(grid, 2);
extensionsList = new TQListBox( d->m_frame ); extensionsList = new TQListBox( d->m_frame );
extensionsList->setSelectionMode( TQListBox::Extended ); extensionsList->setSelectionMode( TQListBox::Extended );

2
tdeio/tdefile/tdefiledialog.cpp
Unescape View File

@ -1093,7 +1093,7 @@ void KFileDialog::initGUI()
lafBox->setColStretch(1, 4); lafBox->setColStretch(1, 4);
vbox->addLayout(TQT_TQLAYOUT(lafBox), 0); vbox->addLayout(lafBox, 0);
vbox->addSpacing(3); vbox->addSpacing(3);
// add the Automatically Select Extension checkbox // add the Automatically Select Extension checkbox

2
tdeio/tdeio/defaultprogress.cpp
Unescape View File

@ -98,7 +98,7 @@ void DefaultProgress::init()
topLayout->addStrut( 360 ); // makes dlg at least that wide topLayout->addStrut( 360 ); // makes dlg at least that wide
TQGridLayout *grid = new TQGridLayout( 2, 3 ); TQGridLayout *grid = new TQGridLayout( 2, 3 );
topLayout->addLayout(TQT_TQLAYOUT(grid)); topLayout->addLayout(grid);
grid->addColSpacing(1, KDialog::spacingHint()); grid->addColSpacing(1, KDialog::spacingHint());
// filenames or action name // filenames or action name
grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0); grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0);

2
tdeio/tdeio/kar.cpp
Unescape View File

@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename )
//kdDebug(7042) << "KAr(filename) reached." << endl; //kdDebug(7042) << "KAr(filename) reached." << endl;
m_filename = filename; m_filename = filename;
d = new KArPrivate; d = new KArPrivate;
setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); setDevice( new TQFile( filename ) );
} }
KAr::KAr( TQIODevice * dev ) KAr::KAr( TQIODevice * dev )

8
tdeio/tdeio/kfilterdev.cpp
Unescape View File

@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file)
//we don't need a filter //we don't need a filter
if (base==0) if (base==0)
return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF)
base->setDevice(TQT_TQIODEVICE(file)); base->setDevice(file);
return new KFilterDev(base); return new KFilterDev(base);
} }
#endif #endif
@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin
: KFilterBase::findFilterByMimeType( mimetype ); : KFilterBase::findFilterByMimeType( mimetype );
if ( base ) if ( base )
{ {
base->setDevice(TQT_TQIODEVICE(f), true); base->setDevice(f, true);
return new KFilterDev(base, true); return new KFilterDev(base, true);
} }
if(!forceFilter) if(!forceFilter)
return TQT_TQIODEVICE(f); return f;
else else
{ {
delete f; delete f;

4
tdeio/tdeio/ktar.cpp
Unescape View File

@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename,
const TQString & mimetype, bool /*forced*/ ) const TQString & mimetype, bool /*forced*/ )
{ {
if( "application/x-tar" == mimetype ) if( "application/x-tar" == mimetype )
setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); setDevice( new TQFile( filename ) );
else else
{ {
// The compression filters are very slow with random access. // The compression filters are very slow with random access.
@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename,
// the device must be closed, however, for KArchive.setDevice() // the device must be closed, however, for KArchive.setDevice()
TQFile* file = d->tmpFile->file(); TQFile* file = d->tmpFile->file();
file->close(); file->close();
setDevice(TQT_TQIODEVICE(file)); setDevice(file);
} }
} }

4
tdeio/tdeio/kzip.cpp
Unescape View File

@ -385,7 +385,7 @@ bool KZip::openArchive( int mode )
return false; return false;
} }
Q_ASSERT( d->m_saveFile->file() ); Q_ASSERT( d->m_saveFile->file() );
setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) ); setDevice( d->m_saveFile->file() );
} }
return true; return true;
case IO_ReadOnly: case IO_ReadOnly:
@ -393,7 +393,7 @@ bool KZip::openArchive( int mode )
{ {
// ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact.
if ( !m_filename.isEmpty() ) { if ( !m_filename.isEmpty() ) {
setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); setDevice( new TQFile( m_filename ) );
if ( !device()->open( mode ) ) if ( !device()->open( mode ) )
return false; return false;
} }

2
tdeio/tdeio/renamedlg.cpp
Unescape View File

@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
// No plugin found, build default dialog // No plugin found, build default dialog
TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(), TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(),
KDialog::spacingHint() ); KDialog::spacingHint() );
pLayout->addLayout(TQT_TQLAYOUT(gridLayout)); pLayout->addLayout(gridLayout);
gridLayout->setColStretch(0,0); gridLayout->setColStretch(0,0);
gridLayout->setColStretch(1,10); gridLayout->setColStretch(1,10);

4
tdeioslave/iso/kiso.cpp
Unescape View File

@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename,
{ {
/* 'hack' for Qt's false assumption that only S_ISREG is seekable */ /* 'hack' for Qt's false assumption that only S_ISREG is seekable */
if( "inode/blockdevice" == mimetype ) if( "inode/blockdevice" == mimetype )
setDevice( TQT_TQIODEVICE(new QFileHack( filename )) ); setDevice( new QFileHack( filename ) );
else else
{ {
if( "application/x-gzip" == mimetype if( "application/x-gzip" == mimetype
@ -190,7 +190,7 @@ KIso::~KIso()
/* callback function for libisofs */ /* callback function for libisofs */
static int readf(char *buf, long long start, long long len,void *udata) { static int readf(char *buf, long long start, long long len,void *udata) {
TQIODevice* dev = ( static_cast<KIso*> (udata) )->device(); TQIODevice* dev = ( static_cast<KIso*>(udata) )->device();
if (dev->at(start<<11)) { if (dev->at(start<<11)) {
if ((dev->readBlock(buf, len<<11)) != -1) return (len); if ((dev->readBlock(buf, len<<11)) != -1) return (len);

2
tdeprint/cups/cupsaddsmb2.cpp
Unescape View File

@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
l1->addWidget(m_sep); l1->addWidget(m_sep);
l1->addWidget(m_text); l1->addWidget(m_text);
TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 );
l1->addLayout( TQT_TQLAYOUT(l3) ); l1->addLayout( l3 );
l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_loginlab, 1, 0 );
l3->addWidget( m_passwdlab, 2, 0 ); l3->addWidget( m_passwdlab, 2, 0 );
l3->addWidget( m_serverlab, 0, 0 ); l3->addWidget( m_serverlab, 0, 0 );

2
tdeprint/cups/cupsdconf2/portdialog.cpp
Unescape View File

@ -45,7 +45,7 @@ PortDialog::PortDialog(TQWidget *parent, const char *name)
TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10);
TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5);
m1->addLayout(TQT_TQLAYOUT(m2)); m1->addLayout(m2);
m2->addWidget(l1, 0, 0, TQt::AlignRight); m2->addWidget(l1, 0, 0, TQt::AlignRight);
m2->addWidget(l2, 1, 0, TQt::AlignRight); m2->addWidget(l2, 1, 0, TQt::AlignRight);
m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1);

2
tdeprint/cups/kmconfigcupsdir.cpp
Unescape View File

@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
lay0->addWidget(m_dirbox); lay0->addWidget(m_dirbox);
lay0->addStretch(1); lay0->addStretch(1);
TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10); TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10);
lay1->addWidget(m_stddir); lay1->addWidget(m_stddir);
lay1->addWidget(m_installdir); lay1->addWidget(m_installdir);

2
tdeprint/cups/kphpgl2page.cpp
Unescape View File

@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
l0->addWidget(box); l0->addWidget(box);
l0->addStretch(1); l0->addStretch(1);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10); TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10);
l1->addWidget(m_blackplot); l1->addWidget(m_blackplot);
l1->addWidget(m_fitplot); l1->addWidget(m_fitplot);
l1->addWidget(m_penwidth); l1->addWidget(m_penwidth);

2
tdeprint/cups/kpimagepage.cpp
Unescape View File

@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
l1->addWidget(m_gamma, 4, 0); l1->addWidget(m_gamma, 4, 0);
l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1);
l1->addWidget(defbtn, 4, 1); l1->addWidget(defbtn, 4, 1);
TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); TQVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3);
l2->addStretch(1); l2->addStretch(1);
l2->addWidget(lab); l2->addWidget(lab);
l2->addWidget(m_sizetype); l2->addWidget(m_sizetype);

6
tdeprint/cups/kptextpage.cpp
Unescape View File

@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
l0->addWidget(formatbox, 0, 0); l0->addWidget(formatbox, 0, 0);
l0->addWidget(prettybox, 0, 1); l0->addWidget(prettybox, 0, 1);
l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5); TQVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5);
l1->addWidget(m_cpi); l1->addWidget(m_cpi);
l1->addWidget(m_lpi); l1->addWidget(m_lpi);
l1->addWidget(sep); l1->addWidget(sep);
l1->addWidget(m_columns); l1->addWidget(m_columns);
TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10); TQGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10);
l2->addWidget(off, 0, 0); l2->addWidget(off, 0, 0);
l2->addWidget(on, 1, 0); l2->addWidget(on, 1, 0);
l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1);
TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10); TQVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10);
l3->addWidget(m_margin); l3->addWidget(m_margin);
} }

2
tdeprint/droptionview.cpp
Unescape View File

@ -308,7 +308,7 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
setColumnLayout(0, TQt::Vertical ); setColumnLayout(0, TQt::Vertical );
layout()->setSpacing( KDialog::spacingHint() ); layout()->setSpacing( KDialog::spacingHint() );
layout()->setMargin( KDialog::marginHint() ); layout()->setMargin( KDialog::marginHint() );
TQVBoxLayout *main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint()); TQVBoxLayout *main_ = new TQVBoxLayout(layout(), KDialog::marginHint());
main_->addWidget(m_stack); main_->addWidget(m_stack);
m_item = 0; m_item = 0;

4
tdeprint/foomatic2loader.cpp
Unescape View File

@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename )
TQFile f( filename ); TQFile f( filename );
m_foodata.clear(); m_foodata.clear();
if ( f.open( IO_ReadOnly ) ) if ( f.open( IO_ReadOnly ) )
return read( TQT_TQIODEVICE(&f) ); return read( &f );
return false; return false;
} }
@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer )
TQBuffer d( buf ); TQBuffer d( buf );
m_foodata.clear(); m_foodata.clear();
if ( d.open( IO_ReadOnly ) ) if ( d.open( IO_ReadOnly ) )
return read( TQT_TQIODEVICE(&d) ); return read( &d );
return false; return false;
} }

2
tdeprint/kpcopiespage.cpp
Unescape View File

@ -221,7 +221,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
l1->setColStretch(1,1); l1->setColStretch(1,1);
l1->addWidget(m_pagebox,0,0); l1->addWidget(m_pagebox,0,0);
l1->addWidget(m_copybox,0,1); l1->addWidget(m_copybox,0,1);
TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5); TQVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->layout(), 5);
l3->addWidget(m_all); l3->addWidget(m_all);
l3->addWidget(m_current); l3->addWidget(m_current);
TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5);

4
tdeprint/kpgeneralpage.cpp
Unescape View File

@ -331,9 +331,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint());
TQGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); TQGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
lay0->addStretch(1); lay0->addStretch(1);
lay0->addLayout(TQT_TQLAYOUT(lay1)); lay0->addLayout(lay1);
lay0->addStretch(1); lay0->addStretch(1);
lay0->addLayout(TQT_TQLAYOUT(lay2)); lay0->addLayout(lay2);
lay0->addStretch(2); lay0->addStretch(2);
lay1->addWidget(m_pagesizelabel, 0, 0); lay1->addWidget(m_pagesizelabel, 0, 0);
lay1->addWidget(m_papertypelabel, 1, 0); lay1->addWidget(m_papertypelabel, 1, 0);

8
tdeprint/lpdunix/kmlpdunixmanager.cpp
Unescape View File

@ -186,7 +186,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
TQFile f(getPrintcapFileName()); TQFile f(getPrintcapFileName());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(TQT_TQIODEVICE(&f)); KTextBuffer t(&f);
TQMap<TQString,TQString> entry; TQMap<TQString,TQString> entry;
while (!t.eof()) while (!t.eof())
@ -247,7 +247,7 @@ void KMLpdUnixManager::parseEtcPrintersConf()
TQFile f(getEtcPrintersConfName()); TQFile f(getEtcPrintersConfName());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(TQT_TQIODEVICE(&f)); KTextBuffer t(&f);
TQMap<TQString,TQString> entry; TQMap<TQString,TQString> entry;
TQString default_printer; TQString default_printer;
@ -297,7 +297,7 @@ void KMLpdUnixManager::parseEtcLpPrinters()
TQFile f(it.current()->absFilePath() + "/configuration"); TQFile f(it.current()->absFilePath() + "/configuration");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(TQT_TQIODEVICE(&f)); KTextBuffer t(&f);
TQString line, remote; TQString line, remote;
while (!t.eof()) while (!t.eof())
{ {
@ -358,7 +358,7 @@ void KMLpdUnixManager::parseSpoolInterface()
TQFile f(it.current()->absFilePath()); TQFile f(it.current()->absFilePath());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(TQT_TQIODEVICE(&f)); KTextBuffer t(&f);
TQString line, remote; TQString line, remote;
while (!t.eof()) while (!t.eof())

2
tdeprint/lpr/printcapreader.cpp
Unescape View File

@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f)
{ {
if (f->isOpen()) if (f->isOpen())
{ {
m_stream.setDevice(TQT_TQIODEVICE(f)); m_stream.setDevice(f);
m_buffer = TQString::null; m_buffer = TQString::null;
} }
} }

2
tdeprint/management/kmconfigcommand.cpp
Unescape View File

@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(gb); l0->addWidget(gb);
l0->addStretch(1); l0->addStretch(1);
TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint()); TQVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint());
l2->addWidget(lab); l2->addWidget(lab);
l2->addWidget(sel); l2->addWidget(sel);
} }

4
tdeprint/management/kmconfigfilter.cpp
Unescape View File

@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 1); l0->addWidget(box, 1);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(lab); l1->addWidget(lab);
TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
l1->addLayout(TQT_TQLAYOUT(l2)); l1->addLayout(l2);
l2->setRowStretch(0, 1); l2->setRowStretch(0, 1);
l2->setRowStretch(3, 1); l2->setRowStretch(3, 1);
l2->setColStretch(0, 1); l2->setColStretch(0, 1);

4
tdeprint/management/kmconfigfonts.cpp
Unescape View File

@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2);
lab0->setBuddy(m_addpath); lab0->setBuddy(m_addpath);
TQVBoxLayout *l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l0->addWidget(m_embedfonts); l0->addWidget(m_embedfonts);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint());
l1->addWidget(m_fontpath); l1->addWidget(m_fontpath);
TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
l1->addLayout(l2); l1->addLayout(l2);

6
tdeprint/management/kmconfiggeneral.cpp
Unescape View File

@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
lay0->addWidget(m_testpagebox); lay0->addWidget(m_testpagebox);
lay0->addWidget(m_statusbox); lay0->addWidget(m_statusbox);
lay0->addStretch(1); lay0->addStretch(1);
TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()), TQVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(),
KDialog::spacingHint()); KDialog::spacingHint());
lay1->addWidget(m_timer); lay1->addWidget(m_timer);
TQVBoxLayout *lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()), TQVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(),
KDialog::spacingHint()); KDialog::spacingHint());
TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0);
lay2->addWidget(m_defaulttestpage); lay2->addWidget(m_defaulttestpage);
@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
lay2->addLayout(lay3); lay2->addLayout(lay3);
lay3->addStretch(1); lay3->addStretch(1);
lay3->addWidget(m_preview); lay3->addWidget(m_preview);
TQVBoxLayout *lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()), TQVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(),
KDialog::spacingHint()); KDialog::spacingHint());
lay4->addWidget(m_statusmsg); lay4->addWidget(m_statusmsg);
lay4->addWidget(m_uselast); lay4->addWidget(m_uselast);

2
tdeprint/management/kmconfigjobs.cpp
Unescape View File

@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 0); l0->addWidget(box, 0);
l0->addStretch(1); l0->addStretch(1);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(m_limit); l1->addWidget(m_limit);
} }

2
tdeprint/management/kmconfigpreview.cpp
Unescape View File

@ -50,7 +50,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box); l0->addWidget(box);
l0->addStretch(1); l0->addStretch(1);
TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(lab); l1->addWidget(lab);
l1->addWidget(m_useext); l1->addWidget(m_useext);
l1->addWidget(m_program); l1->addWidget(m_program);

2
tdeprint/management/kmdriverdbwidget.cpp
Unescape View File

@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10);
main_->addLayout(TQT_TQLAYOUT(sub1_)); main_->addLayout(sub1_);
main_->addLayout(sub2_); main_->addLayout(sub2_);
main_->addWidget(m_raw); main_->addWidget(m_raw);
sub1_->addWidget(l1,0,0); sub1_->addWidget(l1,0,0);

2
tdeprint/management/kmspecialprinterdlg.cpp
Unescape View File

@ -125,7 +125,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
// layout creation // layout creation
TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10);
TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5);
l0->addLayout(TQT_TQLAYOUT(l1)); l0->addLayout(l1);
l1->setColStretch(2,1); l1->setColStretch(2,1);
l1->addColSpacing(0,60); l1->addColSpacing(0,60);
l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter); l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter);

2
tdeprint/management/kmwdrivertest.cpp
Unescape View File

@ -65,7 +65,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0);
TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10);
lay1->addWidget(l0,0); lay1->addWidget(l0,0);
lay1->addLayout(TQT_TQLAYOUT(lay2),0); lay1->addLayout(lay2,0);
lay1->addLayout(lay3,0); lay1->addLayout(lay3,0);
lay1->addStretch(1); lay1->addStretch(1);
lay2->setColStretch(2,1); lay2->setColStretch(2,1);

2
tdeprint/management/kmwpassword.cpp
Unescape View File

@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
main_->addSpacing( 10 ); main_->addSpacing( 10 );
main_->addWidget( m_btngroup ); main_->addWidget( m_btngroup );
TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 );
main_->addLayout( TQT_TQLAYOUT(l1) ); main_->addLayout( l1 );
main_->addStretch( 1 ); main_->addStretch( 1 );
l1->setColSpacing( 0, 35 ); l1->setColSpacing( 0, 35 );
l1->setColStretch( 2, 1 ); l1->setColStretch( 2, 1 );

2
tdeprint/management/kmwsmb.cpp
Unescape View File

@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10);
TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10);
TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10);
lay0->addLayout(TQT_TQLAYOUT(lay1),0); lay0->addLayout(lay1,0);
lay0->addWidget(m_view,1); lay0->addWidget(m_view,1);
lay0->addLayout(lay3,0); lay0->addLayout(lay3,0);
lay0->addSpacing(10); lay0->addSpacing(10);

10
tdeprint/management/kxmlcommanddlg.cpp
Unescape View File

@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
l2->addLayout(l0, 1); l2->addLayout(l0, 1);
l0->addLayout(TQT_TQLAYOUT(l10)); l0->addLayout(l10);
l10->addMultiCellWidget(m_view, 0, 0, 0, 1); l10->addMultiCellWidget(m_view, 0, 0, 0, 1);
l10->addWidget(gb_input, 1, 0); l10->addWidget(gb_input, 1, 0);
l10->addWidget(gb_output, 1, 1); l10->addWidget(gb_output, 1, 1);
@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputfile, 0, 1);
l9->addWidget(m_outputpipe, 1, 1); l9->addWidget(m_outputpipe, 1, 1);
TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); TQVBoxLayout *l11 = new TQVBoxLayout(gb->layout());
l11->addWidget(m_stack); l11->addWidget(m_stack);
TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10);
TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5);
l0->addLayout(TQT_TQLAYOUT(l5)); l0->addLayout(l5);
l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idnamelab, 0, 0);
l5->addWidget(m_idname, 0, 1); l5->addWidget(m_idname, 0, 1);
l5->addWidget(m_desclab, 1, 0); l5->addWidget(m_desclab, 1, 0);
@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetypelab, 0);
l6->addWidget(m_mimetype, 1); l6->addWidget(m_mimetype, 1);
l7->addWidget(m_gb1); l7->addWidget(m_gb1);
TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); TQGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10);
l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_addmime, 1, 1);
l2->addWidget(m_removemime, 2, 1); l2->addWidget(m_removemime, 2, 1);
l2->setRowStretch(0, 1); l2->setRowStretch(0, 1);
l2->setRowStretch(3, 1); l2->setRowStretch(3, 1);
TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); TQHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10);
l4->addWidget(m_requirements); l4->addWidget(m_requirements);
TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0);
l4->addLayout(l8); l4->addLayout(l8);

2
tdeprint/management/kxmlcommandselector.cpp
Unescape View File

@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5);
int c(0); int c(0);
l0->addLayout(TQT_TQLAYOUT(l2)); l0->addLayout(l2);
if (m_usefilter) if (m_usefilter)
{ {
l2->addWidget(m_usefilter, 0, c++); l2->addWidget(m_usefilter, 0, c++);

2
tdestyles/keramik/keramik.cpp
Unescape View File

@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe,
if (kickerMode) if (kickerMode)
{ {
if (p->device() && p->device()->devType() == TQInternal::Widget && if (p->device() && p->device()->devType() == TQInternal::Widget &&
TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame" ) TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame" )
{ {
int x2 = x + r.width() - 1; int x2 = x + r.width() - 1;
int y2 = y + r.height() - 1; int y2 = y + r.height() - 1;

56
tdestyles/kthemestyle/kthemebase.cpp
Unescape View File

@ -243,42 +243,42 @@ void KThemeBase::generateBorderPix( int i )
TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, 0, pbWidth[ i ], pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ],
TQt::CopyROP, false ); TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ],
TQt::CopyROP, false ); TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
} }
pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp ); pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0,
pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
} }
pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp ); pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
} }
pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp ); pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
TQt::CopyROP, false ); TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
TQt::CopyROP, false ); TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
@ -287,23 +287,23 @@ void KThemeBase::generateBorderPix( int i )
tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], 0, bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0,
pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0,
pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ],
TQt::CopyROP, false ); TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
} }
pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp ); pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ],
pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ],
pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
@ -312,23 +312,23 @@ void KThemeBase::generateBorderPix( int i )
tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbWidth[ i ], pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ],
pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
} }
pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp ); pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp );
bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
TQt::CopyROP, false ); TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
{ {
bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
TQt::CopyROP, false ); TQt::CopyROP, false );
tmp.setMask( destMask ); tmp.setMask( destMask );
@ -813,10 +813,10 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
const TQBitmap *srcMask = tmp->mask(); const TQBitmap *srcMask = tmp->mask();
int bdWidth = tmp->width(); int bdWidth = tmp->width();
bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth, bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth,
TQt::CopyROP, false ); TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, bitBlt( &mask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth,
TQt::CopyROP, false ); TQt::CopyROP, false );
else else
mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 ); mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 );
@ -824,30 +824,30 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight ); tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight );
srcMask = tmp->mask(); srcMask = tmp->mask();
bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth,
bdWidth, TQt::CopyROP, false ); bdWidth, TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bitBlt( &mask, w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
bdWidth, TQt::CopyROP, false ); bdWidth, TQt::CopyROP, false );
else else
mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 ); mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 );
tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft );
srcMask = tmp->mask(); srcMask = tmp->mask();
bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth,
bdWidth, TQt::CopyROP, false ); bdWidth, TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bitBlt( &mask, 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
bdWidth, TQt::CopyROP, false ); bdWidth, TQt::CopyROP, false );
else else
mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 ); mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 );
tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight );
srcMask = tmp->mask(); srcMask = tmp->mask();
bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0,
bdWidth, bdWidth, TQt::CopyROP, false ); bdWidth, bdWidth, TQt::CopyROP, false );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bitBlt( &mask, w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
bdWidth, bdWidth, TQt::CopyROP, false ); bdWidth, bdWidth, TQt::CopyROP, false );
else else
mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 ); mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 );
@ -860,7 +860,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
srcMask = tmp->mask(); srcMask = tmp->mask();
p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp ); p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bitBlt( &mask, bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); w - bdWidth * 2, bdWidth, TQt::CopyROP, false );
else else
mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 ); mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 );
@ -870,7 +870,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
*tmp ); *tmp );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bitBlt( &mask, bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); w - bdWidth * 2, bdWidth, TQt::CopyROP, false );
else else
mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
@ -882,7 +882,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
srcMask = tmp->mask(); srcMask = tmp->mask();
p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bitBlt( &mask, 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); bdWidth, h - bdWidth * 2, TQt::CopyROP, false );
else else
mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 ); mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 );
@ -892,7 +892,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
*tmp ); *tmp );
if ( srcMask ) if ( srcMask )
bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bitBlt( &mask, w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); bdWidth, h - bdWidth * 2, TQt::CopyROP, false );
else else
mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 ); mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 );

4
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -677,7 +677,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
if ( gradientHint( type ) == GrReverseBevel ) if ( gradientHint( type ) == GrReverseBevel )
{ {
int i; int i;
bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, bitBlt( p->device(), x, y, scalePixmap( w, h, type ), 0, 0, w, h,
TQt::CopyROP, true ); TQt::CopyROP, true );
p->setPen( g.text() ); p->setPen( g.text() );
for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 ) for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 )
@ -717,7 +717,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
} }
if ( borderPixmap( type ) ) if ( borderPixmap( type ) )
{ {
bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h,
TQt::CopyROP, false ); TQt::CopyROP, false );
} }
else else

2
tdestyles/plastik/plastik.cpp
Unescape View File

@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p,
if (kickerMode && if (kickerMode &&
p->device() && p->device()->devType() == TQInternal::Widget && p->device() && p->device()->devType() == TQInternal::Widget &&
TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame") { TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame") {
// Stolen wholesale from Keramik. I don't like it, but oh well. // Stolen wholesale from Keramik. I don't like it, but oh well.
if (sunken) { if (sunken) {
const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y };

2
tdeui/kcolordialog.cpp
Unescape View File

@ -981,7 +981,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
l_left->addSpacing(10); l_left->addSpacing(10);
TQGridLayout *l_lbot = new TQGridLayout(3, 6); TQGridLayout *l_lbot = new TQGridLayout(3, 6);
l_left->addLayout(TQT_TQLAYOUT(l_lbot)); l_left->addLayout(l_lbot);
// //
// the palette and value selector go into the H-box // the palette and value selector go into the H-box

2
tdeui/kdialog.cpp
Unescape View File

@ -141,7 +141,7 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing )
{ {
if( w->layout() ) if( w->layout() )
{ {
resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing ); resizeLayout( w->layout(), margin, spacing );
} }
if( !w->childrenListObject().isEmpty() ) if( !w->childrenListObject().isEmpty() )

2
tdeui/kedittoolbar.cpp
Unescape View File

@ -890,7 +890,7 @@ void KEditToolbarWidget::setupLayout()
changeIcon_layout->addStretch( 1 ); changeIcon_layout->addStretch( 1 );
list_layout->addLayout(inactive_layout); list_layout->addLayout(inactive_layout);
list_layout->addLayout(TQT_TQLAYOUT(button_layout)); list_layout->addLayout(button_layout);
list_layout->addLayout(active_layout); list_layout->addLayout(active_layout);
top_layout->addLayout(name_layout); top_layout->addLayout(name_layout);

2
tdeui/kkeydialog.cpp
Unescape View File

@ -340,7 +340,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
// fill up the split list box with the action/key pairs. // fill up the split list box with the action/key pairs.
// //
TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2); TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2);
topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 ); topLayout->addLayout( stackLayout, 10 );
stackLayout->setRowStretch( 1, 10 ); // Only list will stretch stackLayout->setRowStretch( 1, 10 ); // Only list will stretch
d->pList = new TDEListView( this ); d->pList = new TDEListView( this );

2
tdeui/kswitchlanguagedialog.cpp
Unescape View File

@ -100,7 +100,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog(
topLayout->addLayout(languageHorizontalLayout); topLayout->addLayout(languageHorizontalLayout);
d->languagesLayout = new TQGridLayout(0 , 2); d->languagesLayout = new TQGridLayout(0 , 2);
languageHorizontalLayout->addLayout(TQT_TQLAYOUT(d->languagesLayout)); languageHorizontalLayout->addLayout(d->languagesLayout);
languageHorizontalLayout->addStretch(); languageHorizontalLayout->addStretch();
TQStringList defaultLanguages = d->applicationLanguageList(); TQStringList defaultLanguages = d->applicationLanguageList();

Write Preview
Loading…
Cancel
Save