TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
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/432/head
Michele Calgaro 5 months ago
parent a1cbb16bad
commit 1390bece9a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
21 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
kcontrol/filetypes/filetypesview.cpp
Unescape View File

@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
leftLayout->setSpacing( KDialog::spacingHint() ); leftLayout->setSpacing( KDialog::spacingHint() );
leftLayout->setColStretch(1, 1); leftLayout->setColStretch(1, 1);
l->addLayout( TQT_TQLAYOUT(leftLayout) ); l->addLayout( leftLayout );
TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this); TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this);
leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2); leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2);

2
kcontrol/filetypes/newtypedlg.cpp
Unescape View File

@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups,
TQGridLayout *grid = new TQGridLayout(2, 2); TQGridLayout *grid = new TQGridLayout(2, 2);
grid->setColStretch(1, 1); grid->setColStretch(1, 1);
topl->addLayout(TQT_TQLAYOUT(grid)); topl->addLayout(grid);
TQLabel *l = new TQLabel(i18n("Group:"), main); TQLabel *l = new TQLabel(i18n("Group:"), main);
grid->addWidget(l, 0, 0); grid->addWidget(l, 0, 0);

2
kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
Unescape View File

@ -159,7 +159,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
fontsLayout->addWidget(button, 1, 0); fontsLayout->addWidget(button, 1, 0);
TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
layout->addWidget(toolbar); layout->addWidget(toolbar);
#ifdef HAVE_XFT #ifdef HAVE_XFT

2
kdesktop/minicli.cpp
Unescape View File

@ -877,7 +877,7 @@ void Minicli::setIcon ()
{ {
TQBitmap mask = *icon.mask(); TQBitmap mask = *icon.mask();
bitBlt( &mask, x, y, bitBlt( &mask, x, y,
overlay.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.mask())) : &overlay, overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
0, 0, overlay.width(), overlay.height(), 0, 0, overlay.width(), overlay.height(),
overlay.mask() ? OrROP : SetROP ); overlay.mask() ? OrROP : SetROP );
icon.setMask(mask); icon.setMask(mask);

2
kicker/kicker/core/container_extension.cpp
Unescape View File

@ -1427,7 +1427,7 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
// Nastiness to both vertically flip the PE_Separator // Nastiness to both vertically flip the PE_Separator
// and make sure it pops out of, not sinks into, the screen // and make sure it pops out of, not sinks into, the screen
TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH);
TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); TQPainter myp(&inv_pm);
rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
TQColorGroup darkcg = colorGroup(); TQColorGroup darkcg = colorGroup();
darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); darkcg.setColor(TQColorGroup::Light, colorGroup().dark());

2
kicker/kicker/core/containerarealayout.cpp
Unescape View File

@ -213,7 +213,7 @@ ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
void ContainerAreaLayout::addItem(TQLayoutItem* item) void ContainerAreaLayout::addItem(TQLayoutItem* item)
{ {
m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this)); m_items.append(new ContainerAreaLayoutItem(item, this));
} }
void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint)

10
kicker/kicker/ui/itemview.cpp
Unescape View File

@ -158,12 +158,12 @@ void KMenuItem::setup()
float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
const int expected_height = 38; const int expected_height = 38;
description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
//kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl;
TQListViewItem::setup(); TQListViewItem::setup();
setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView())));
} }
void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align)
@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
if ( m_description.isEmpty() ) if ( m_description.isEmpty() )
spacing = ( height() - f1h ) / 2; spacing = ( height() - f1h ) / 2;
int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); int right_triangle_size = pixelSize( 7, listView() );
int right_margin = listView()->verticalScrollBar()->width(); int right_margin = listView()->verticalScrollBar()->width();
if ( m_has_children ) if ( m_has_children )
@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int
int r = left_margin + margin * 2; int r = left_margin + margin * 2;
const int min_font_size = 7; const int min_font_size = 7;
int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) );
TQFont f1 = p->font(); TQFont f1 = p->font();
f1.setPixelSize( title_font_pixelSize ); f1.setPixelSize( title_font_pixelSize );

4
konsole/konsole/keytrans.cpp
Unescape View File

@ -363,11 +363,11 @@ void KeyTrans::readConfig()
TQBuffer* newbuf; TQBuffer* newbuf;
newbuf = new TQBuffer(); newbuf = new TQBuffer();
newbuf->setBuffer(txt); newbuf->setBuffer(txt);
buf=TQT_TQIODEVICE(newbuf); buf=newbuf;
} }
else else
{ {
buf=TQT_TQIODEVICE(new TQFile(m_path)); buf=new TQFile(m_path);
}; };
KeytabReader ktr(m_path,*buf); KeytabReader ktr(m_path,*buf);
ktr.parseTo(this); ktr.parseTo(this);

2
libkonq/favicons/favicons.cpp
Unescape View File

@ -219,7 +219,7 @@ void FaviconsModule::slotResult(TDEIO::Job *job)
TQBuffer buffer(download.iconData); TQBuffer buffer(download.iconData);
buffer.open(IO_ReadOnly); buffer.open(IO_ReadOnly);
TQImageIO io; TQImageIO io;
io.setIODevice(TQT_TQIODEVICE(&buffer)); io.setIODevice(&buffer);
io.setParameters("size=16"); io.setParameters("size=16");
// Check here too, the job might have had no error, but the downloaded // Check here too, the job might have had no error, but the downloaded
// file contains just a 404 message sent with a 200 status. // file contains just a 404 message sent with a 200 status.

2
libkonq/konq_pixmapprovider.cpp
Unescape View File

@ -186,7 +186,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
if ( big.mask() ) { if ( big.mask() ) {
TQBitmap mask = *big.mask(); TQBitmap mask = *big.mask();
bitBlt( &mask, x, y, bitBlt( &mask, x, y,
small.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.mask())) : &small, 0, 0, small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
small.width(), small.height(), small.width(), small.height(),
small.mask() ? OrROP : SetROP ); small.mask() ? OrROP : SetROP );
big.setMask( mask ); big.setMask( mask );

2
tdedebugdialog/tdedebugdialog.cpp
Unescape View File

@ -60,7 +60,7 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() ); TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() );
if( gbox == 0 ) { return; } if( gbox == 0 ) { return; }
topLayout->addLayout( TQT_TQLAYOUT(gbox) ); topLayout->addLayout( gbox );
TQStringList destList; TQStringList destList;
destList.append( i18n("File") ); destList.append( i18n("File") );

2
tdeprint/tdeprintfax/confsystem.cpp
Unescape View File

@ -75,7 +75,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10);
TQGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10); TQGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10);
l0->addLayout(TQT_TQLAYOUT(l1)); l0->addLayout(l1);
l1->setColStretch(1, 1); l1->setColStretch(1, 1);
l1->addWidget(syslabel, 0, 0); l1->addWidget(syslabel, 0, 0);
l1->addWidget(cmdlabel, 1, 0); l1->addWidget(cmdlabel, 1, 0);

2
tdm/kfrontend/kgreeter.cpp
Unescape View File

@ -393,7 +393,7 @@ KGreeter::insertUser( const TQImage &default_pix,
TQBuffer buf( fc ); TQBuffer buf( fc );
buf.open( IO_ReadOnly ); buf.open( IO_ReadOnly );
TQImageIO ir; TQImageIO ir;
ir.setIODevice( TQT_TQIODEVICE(&buf) ); ir.setIODevice( &buf );
if (!ir.read()) { if (!ir.read()) {
LogInfo( "%s is no valid image\n", fn.data() ); LogInfo( "%s is no valid image\n", fn.data() );
continue; continue;

2
tdm/kfrontend/kgverify.h
Unescape View File

@ -200,7 +200,7 @@ class KGStdVerify : public KGVerify {
const PluginList &pluginList, const PluginList &pluginList,
KGreeterPlugin::Function func, KGreeterPlugin::Context ctx ); KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
virtual ~KGStdVerify(); virtual ~KGStdVerify();
TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); } TQLayout *getLayout() const { return grid; }
void selectPlugin( int id ); void selectPlugin( int id );
protected: protected:

4
tdmlib/kgreet_classic.cpp
Unescape View File

@ -83,7 +83,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
if (!themer) if (!themer)
grid = new TQGridLayout( 0, 0, 10 ); grid = new TQGridLayout( 0, 0, 10 );
layoutItem = TQT_TQLAYOUTITEM(grid); layoutItem = grid;
loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
loginEdit = 0; loginEdit = 0;
@ -174,7 +174,7 @@ KClassicGreeter::~KClassicGreeter()
delete passwdEdit; delete passwdEdit;
return; return;
} }
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it) for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget(); delete itm->widget();
delete layoutItem; delete layoutItem;

4
tdmlib/kgreet_pam.cpp
Unescape View File

@ -111,7 +111,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
m_themer = themer; m_themer = themer;
if (!themer) if (!themer)
layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 )); layoutItem = new TQGridLayout( 0, 0, 10 );
loginLabel = 0; loginLabel = 0;
authLabel.clear(); authLabel.clear();
@ -211,7 +211,7 @@ KPamGreeter::~KPamGreeter()
delete loginEdit; delete loginEdit;
return; return;
} }
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it) for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget(); delete itm->widget();
delete layoutItem; delete layoutItem;

2
tdmlib/kgreet_pam.h
Unescape View File

@ -68,7 +68,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
virtual void revive(); virtual void revive();
virtual void clear(); virtual void clear();
TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); } TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
public slots: public slots:
void slotLoginLostFocus(); void slotLoginLostFocus();

4
tdmlib/kgreet_winbind.cpp
Unescape View File

@ -93,7 +93,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
if (!themer) if (!themer)
{ {
grid = new TQGridLayout( 0, 0, 10 ); grid = new TQGridLayout( 0, 0, 10 );
layoutItem = TQT_TQLAYOUTITEM(grid); layoutItem = grid;
} }
domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
@ -217,7 +217,7 @@ KWinbindGreeter::~KWinbindGreeter()
delete domainCombo; delete domainCombo;
return; return;
} }
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it) for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget(); delete itm->widget();
delete layoutItem; delete layoutItem;

16
twin/clients/b2/b2client.cpp
Unescape View File

@ -982,7 +982,7 @@ static void redraw_pixmaps()
TQColor color = is_act ? aGrp.button() : iGrp.button(); TQColor color = is_act ? aGrp.button() : iGrp.button();
drawB2Rect(&thinBox, color, is_down); drawB2Rect(&thinBox, color, is_down);
pix->fill(TQt::black); pix->fill(TQt::black);
bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), bitBlt(pix, 0, 0, &thinBox,
0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true);
} }
@ -1005,12 +1005,12 @@ static void redraw_pixmaps()
drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down);
pix->fill(options()->color(KDecoration::ColorTitleBar, is_act)); pix->fill(options()->color(KDecoration::ColorTitleBar, is_act));
bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox), bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox,
0, 0, 12, 12, TQt::CopyROP, true); 0, 0, 12, 12, TQt::CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0, bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0,
TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
} }
// resize // resize
@ -1020,8 +1020,8 @@ static void redraw_pixmaps()
*pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; *pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
pixmap[P_RESIZE * NumStates + i]->detach(); pixmap[P_RESIZE * NumStates + i]->detach();
drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), bitBlt(pixmap[P_RESIZE * NumStates + i],
0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
} }
@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *)
void B2Titlebar::paintEvent(TQPaintEvent *) void B2Titlebar::paintEvent(TQPaintEvent *)
{ {
if(client->isActive()) if(client->isActive())
bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(), bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(),
titleBuffer.height(), TQt::CopyROP, true); titleBuffer.height(), TQt::CopyROP, true);
else { else {
TQPainter p(this); TQPainter p(this);

2
twin/clients/keramik/embedtool.cpp
Unescape View File

@ -66,7 +66,7 @@ KeramikEmbedder::KeramikEmbedder()
file = new TQFile( "tiles.h" ); file = new TQFile( "tiles.h" );
file->open( IO_WriteOnly | IO_Truncate ); file->open( IO_WriteOnly | IO_Truncate );
stream.setDevice( TQT_TQIODEVICE(file) ); stream.setDevice( file );
stream << "/*\n"; stream << "/*\n";
stream << " * Generated by embedtool 1.0 on " << datestring << endl; stream << " * Generated by embedtool 1.0 on " << datestring << endl;

2
twin/kcmtwin/twinoptions/windows.cpp
Unescape View File

@ -1010,7 +1010,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
" its size.")); " its size."));
TQGridLayout *rLay = new TQGridLayout(2,3); TQGridLayout *rLay = new TQGridLayout(2,3);
bLay->addLayout(TQT_TQLAYOUT(rLay)); bLay->addLayout(rLay);
rLay->setColStretch(0,0); rLay->setColStretch(0,0);
rLay->setColStretch(1,1); rLay->setColStretch(1,1);

Write Preview
Loading…
Cancel
Save