Replace Qt with TQt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c8ece3630d)
pull/271/head
Michele Calgaro 10 months ago
parent 141ced0c41
commit 303b644501

@ -196,7 +196,7 @@ The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
have been removed. (Nobody on the list knew what its function was have been removed. (Nobody on the list knew what its function was
supposed to be.) Calls to <i>insert()</i> and the equivalent supposed to be.) Calls to <i>insert()</i> and the equivalent
<i>key(TDEStdAccel::Insert)</i> can be replaced with the former default <i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
of <i>Qt::CTRL+Qt::Key_Insert</i>.</li> of <i>TQt::CTRL+TQt::Key_Insert</i>.</li>
<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined: <li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
<table border=1> <table border=1>
<tr><th>Old</th><th>New</th></tr> <tr><th>Old</th><th>New</th></tr>

@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char
{ {
this->videoWidget = parent; this->videoWidget = parent;
setEraseColor( black ); setEraseColor( black );
setCursor(TQCursor(Qt::BlankCursor)); setCursor(TQCursor(TQt::BlankCursor));
} }
void KFullscreenVideoWidget::windowActivationChange( bool ) void KFullscreenVideoWidget::windowActivationChange( bool )
@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
emit mouseButtonPressed( event->button(), pos, event->state() ); emit mouseButtonPressed( event->button(), pos, event->state() );
// ### Remove in KDE4 // ### Remove in KDE4
if ( event->button() == Qt::RightButton ) if ( event->button() == TQt::RightButton )
emit rightButtonPressed( pos ); emit rightButtonPressed( pos );
} }

@ -197,7 +197,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/>
<itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
<itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
<itemData name="Error" defStyleNum="dsError" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>

@ -347,7 +347,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
<itemData name="Alert" defStyleNum="dsAlert" /> <itemData name="Alert" defStyleNum="dsAlert" />
</itemDatas> </itemDatas>
</highlighting> </highlighting>

@ -159,7 +159,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
<itemData name="Alert" defStyleNum="dsAlert" /> <itemData name="Alert" defStyleNum="dsAlert" />
</itemDatas> </itemDatas>
</highlighting> </highlighting>

@ -100,7 +100,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
<itemData name="Alert" defStyleNum="dsAlert" /> <itemData name="Alert" defStyleNum="dsAlert" />
</itemDatas> </itemDatas>
</highlighting> </highlighting>

@ -172,7 +172,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
</itemDatas> </itemDatas>
</highlighting> </highlighting>
<general> <general>

@ -230,7 +230,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Preprocessor" defStyleNum="dsOthers"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
</itemDatas> </itemDatas>
</highlighting> </highlighting>
<general> <general>

@ -241,7 +241,7 @@
<itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/>
<itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
<itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
<itemData name="Error" defStyleNum="dsError" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>

@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
: TQFrame( parent, name, (WFlags)WType_Popup ) : TQFrame( parent, name, (WFlags)WType_Popup )
{ {
setBackgroundColor( black ); setBackgroundColor( black );
setPaletteForegroundColor( Qt::black ); setPaletteForegroundColor( TQt::black );
labelDict.setAutoDelete( true ); labelDict.setAutoDelete( true );
layout = new TQVBoxLayout( this, 1, 2 ); layout = new TQVBoxLayout( this, 1, 2 );

@ -1155,13 +1155,13 @@ void KateRendererConfig::setSchemaInternal( int schema )
// same std colors like in KateDocument::markColor // same std colors like in KateDocument::markColor
TQColor mark[7]; TQColor mark[7];
mark[0] = Qt::blue; mark[0] = TQt::blue;
mark[1] = Qt::red; mark[1] = TQt::red;
mark[2] = Qt::yellow; mark[2] = TQt::yellow;
mark[3] = Qt::magenta; mark[3] = TQt::magenta;
mark[4] = Qt::gray; mark[4] = TQt::gray;
mark[5] = Qt::green; mark[5] = TQt::green;
mark[6] = Qt::red; mark[6] = TQt::red;
for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) { for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) {
TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]); TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]);

@ -179,7 +179,7 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys); opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys);
TQRadioButton *rb1, *rb2, *rb3; TQRadioButton *rb1, *rb2, *rb3;
m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this );
m_tabs->setRadioButtonExclusive( true ); m_tabs->setRadioButtonExclusive( true );
m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 ); m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 );
m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 ); m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 );
@ -376,7 +376,7 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
TQRadioButton *rb1, *rb2; TQRadioButton *rb1, *rb2;
m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this ); m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Selection Mode"), this );
layout->add (m_tabs); layout->add (m_tabs);
m_tabs->setRadioButtonExclusive( true ); m_tabs->setRadioButtonExclusive( true );
@ -684,7 +684,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
blay->addWidget(gbBar); blay->addWidget(gbBar);
m_bmSort = new TQButtonGroup( 1, Qt::Horizontal, i18n("Sort Bookmarks Menu"), this ); m_bmSort = new TQButtonGroup( 1, TQt::Horizontal, i18n("Sort Bookmarks Menu"), this );
m_bmSort->setRadioButtonExclusive( true ); m_bmSort->setRadioButtonExclusive( true );
m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 ); m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 );
m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 ); m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 );
@ -895,7 +895,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
dirSearchDepth->setSpecialValueText( i18n("Do not use config file") ); dirSearchDepth->setSpecialValueText( i18n("Do not use config file") );
dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter); dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter);
TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this ); TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Backup on Save"), this );
layout->addWidget( gb ); layout->addWidget( gb );
cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb ); cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb );
cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb ); cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb );
@ -1130,7 +1130,7 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf
btnConfigure = new TQPushButton( i18n("Configure..."), this ); btnConfigure = new TQPushButton( i18n("Configure..."), this );
btnConfigure->setEnabled( false ); btnConfigure->setEnabled( false );
grid->addWidget( btnConfigure, 1, 0, Qt::AlignRight ); grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight );
connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) ); connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) );
connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) );
@ -1276,7 +1276,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i)); hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i));
} }
TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this ); TQGroupBox *gbInfo = new TQGroupBox( 1, TQt::Horizontal, i18n("Information"), this );
layout->add (gbInfo); layout->add (gbInfo);
// author // author
@ -1290,7 +1290,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
new TQLabel( i18n("License:"), hb2 ); new TQLabel( i18n("License:"), hb2 );
license = new TQLabel (hb2); license = new TQLabel (hb2);
TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this ); TQGroupBox *gbProps = new TQGroupBox( 1, TQt::Horizontal, i18n("Properties"), this );
layout->add (gbProps); layout->add (gbProps);
// file & mime types // file & mime types

@ -4654,7 +4654,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
bool found = false; bool found = false;
for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i) for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i)
{ {
TQRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); TQRegExp wildcard (wildcards[i], true/*TQt::CaseSensitive*/, true/*TQRegExp::Wildcard*/);
found = wildcard.exactMatch (nameOfFile); found = wildcard.exactMatch (nameOfFile);
} }

@ -282,7 +282,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
btndel = new TQPushButton( i18n("&Delete"), hbHl ); btndel = new TQPushButton( i18n("&Delete"), hbHl );
connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) );
gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this ); gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this );
layout->add (gbProps); layout->add (gbProps);
// file & mime types // file & mime types

@ -3193,79 +3193,79 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
list.setAutoDelete(true); list.setAutoDelete(true);
KateAttribute* normal = new KateAttribute(); KateAttribute* normal = new KateAttribute();
normal->setTextColor(Qt::black); normal->setTextColor(TQt::black);
normal->setSelectedTextColor(Qt::white); normal->setSelectedTextColor(TQt::white);
list.append(normal); list.append(normal);
KateAttribute* keyword = new KateAttribute(); KateAttribute* keyword = new KateAttribute();
keyword->setTextColor(Qt::black); keyword->setTextColor(TQt::black);
keyword->setSelectedTextColor(Qt::white); keyword->setSelectedTextColor(TQt::white);
keyword->setBold(true); keyword->setBold(true);
list.append(keyword); list.append(keyword);
KateAttribute* dataType = new KateAttribute(); KateAttribute* dataType = new KateAttribute();
dataType->setTextColor(Qt::darkRed); dataType->setTextColor(TQt::darkRed);
dataType->setSelectedTextColor(Qt::white); dataType->setSelectedTextColor(TQt::white);
list.append(dataType); list.append(dataType);
KateAttribute* decimal = new KateAttribute(); KateAttribute* decimal = new KateAttribute();
decimal->setTextColor(Qt::blue); decimal->setTextColor(TQt::blue);
decimal->setSelectedTextColor(Qt::cyan); decimal->setSelectedTextColor(TQt::cyan);
list.append(decimal); list.append(decimal);
KateAttribute* basen = new KateAttribute(); KateAttribute* basen = new KateAttribute();
basen->setTextColor(Qt::darkCyan); basen->setTextColor(TQt::darkCyan);
basen->setSelectedTextColor(Qt::cyan); basen->setSelectedTextColor(TQt::cyan);
list.append(basen); list.append(basen);
KateAttribute* floatAttribute = new KateAttribute(); KateAttribute* floatAttribute = new KateAttribute();
floatAttribute->setTextColor(Qt::darkMagenta); floatAttribute->setTextColor(TQt::darkMagenta);
floatAttribute->setSelectedTextColor(Qt::cyan); floatAttribute->setSelectedTextColor(TQt::cyan);
list.append(floatAttribute); list.append(floatAttribute);
KateAttribute* charAttribute = new KateAttribute(); KateAttribute* charAttribute = new KateAttribute();
charAttribute->setTextColor(Qt::magenta); charAttribute->setTextColor(TQt::magenta);
charAttribute->setSelectedTextColor(Qt::magenta); charAttribute->setSelectedTextColor(TQt::magenta);
list.append(charAttribute); list.append(charAttribute);
KateAttribute* string = new KateAttribute(); KateAttribute* string = new KateAttribute();
string->setTextColor(TQColor("#D00")); string->setTextColor(TQColor("#D00"));
string->setSelectedTextColor(Qt::red); string->setSelectedTextColor(TQt::red);
list.append(string); list.append(string);
KateAttribute* comment = new KateAttribute(); KateAttribute* comment = new KateAttribute();
comment->setTextColor(Qt::darkGray); comment->setTextColor(TQt::darkGray);
comment->setSelectedTextColor(Qt::gray); comment->setSelectedTextColor(TQt::gray);
comment->setItalic(true); comment->setItalic(true);
list.append(comment); list.append(comment);
KateAttribute* others = new KateAttribute(); KateAttribute* others = new KateAttribute();
others->setTextColor(Qt::darkGreen); others->setTextColor(TQt::darkGreen);
others->setSelectedTextColor(Qt::green); others->setSelectedTextColor(TQt::green);
list.append(others); list.append(others);
KateAttribute* alert = new KateAttribute(); KateAttribute* alert = new KateAttribute();
alert->setTextColor(Qt::black); alert->setTextColor(TQt::black);
alert->setSelectedTextColor( TQColor("#FCC") ); alert->setSelectedTextColor( TQColor("#FCC") );
alert->setBold(true); alert->setBold(true);
alert->setBGColor( TQColor("#FCC") ); alert->setBGColor( TQColor("#FCC") );
list.append(alert); list.append(alert);
KateAttribute* functionAttribute = new KateAttribute(); KateAttribute* functionAttribute = new KateAttribute();
functionAttribute->setTextColor(Qt::darkBlue); functionAttribute->setTextColor(TQt::darkBlue);
functionAttribute->setSelectedTextColor(Qt::white); functionAttribute->setSelectedTextColor(TQt::white);
list.append(functionAttribute); list.append(functionAttribute);
KateAttribute* regionmarker = new KateAttribute(); KateAttribute* regionmarker = new KateAttribute();
regionmarker->setTextColor(Qt::white); regionmarker->setTextColor(TQt::white);
regionmarker->setBGColor(Qt::gray); regionmarker->setBGColor(TQt::gray);
regionmarker->setSelectedTextColor(Qt::gray); regionmarker->setSelectedTextColor(TQt::gray);
list.append(regionmarker); list.append(regionmarker);
KateAttribute* error = new KateAttribute(); KateAttribute* error = new KateAttribute();
error->setTextColor(Qt::red); error->setTextColor(TQt::red);
error->setUnderline(true); error->setUnderline(true);
error->setSelectedTextColor(Qt::red); error->setSelectedTextColor(TQt::red);
list.append(error); list.append(error);
TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();

@ -228,9 +228,9 @@ bool KatePrinter::print (KateDocument *doc)
headerTagList = TQStringList::split('|', headerTags, true); headerTagList = TQStringList::split('|', headerTags, true);
if (!headerBgColor.isValid()) if (!headerBgColor.isValid())
headerBgColor = Qt::lightGray; headerBgColor = TQt::lightGray;
if (!headerFgColor.isValid()) if (!headerFgColor.isValid())
headerFgColor = Qt::black; headerFgColor = TQt::black;
} }
if (useFooter) if (useFooter)
@ -255,9 +255,9 @@ bool KatePrinter::print (KateDocument *doc)
footerTagList = TQStringList::split('|', footerTags, true); footerTagList = TQStringList::split('|', footerTags, true);
if (!footerBgColor.isValid()) if (!footerBgColor.isValid())
footerBgColor = Qt::lightGray; footerBgColor = TQt::lightGray;
if (!footerFgColor.isValid()) if (!footerFgColor.isValid())
footerFgColor = Qt::black; footerFgColor = TQt::black;
// adjust maxheight, so we can know when/where to print footer // adjust maxheight, so we can know when/where to print footer
maxHeight -= footerHeight; maxHeight -= footerHeight;
} }
@ -275,7 +275,7 @@ bool KatePrinter::print (KateDocument *doc)
if ( useBox ) if ( useBox )
{ {
if (!boxColor.isValid()) if (!boxColor.isValid())
boxColor = Qt::black; boxColor = TQt::black;
if (boxWidth < 1) // shouldn't be pssible no more! if (boxWidth < 1) // shouldn't be pssible no more!
boxWidth = 1; boxWidth = 1;
// set maxwidth to something sensible // set maxwidth to something sensible
@ -307,7 +307,7 @@ bool KatePrinter::print (KateDocument *doc)
// get a title and add the height required to draw it // get a title and add the height required to draw it
TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name()); TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name());
guideHeight += paint.boundingRect( 0, 0, _w, 1000, Qt::AlignTop|Qt::AlignHCenter, _title ).height(); guideHeight += paint.boundingRect( 0, 0, _w, 1000, TQt::AlignTop|TQt::AlignHCenter, _title ).height();
// see how many columns we can fit in // see how many columns we can fit in
int _widest( 0 ); int _widest( 0 );
@ -417,8 +417,8 @@ bool KatePrinter::print (KateDocument *doc)
if (headerTagList.count() == 3) if (headerTagList.count() == 3)
{ {
int valign = ( (useBox||headerDrawBg||useBackground) ? int valign = ( (useBox||headerDrawBg||useBackground) ?
Qt::AlignVCenter : Qt::AlignTop ); TQt::AlignVCenter : TQt::AlignTop );
int align = valign|Qt::AlignLeft; int align = valign|TQt::AlignLeft;
int marg = ( useBox || headerDrawBg ) ? innerMargin : 0; int marg = ( useBox || headerDrawBg ) ? innerMargin : 0;
if ( useBox ) marg += boxWidth; if ( useBox ) marg += boxWidth;
TQString s; TQString s;
@ -427,7 +427,7 @@ bool KatePrinter::print (KateDocument *doc)
s = headerTagList[i]; s = headerTagList[i];
if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s);
align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); align = valign|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight);
} }
} }
if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents
@ -446,7 +446,7 @@ bool KatePrinter::print (KateDocument *doc)
paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor); paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor);
if (footerTagList.count() == 3) if (footerTagList.count() == 3)
{ {
int align = Qt::AlignVCenter|Qt::AlignLeft; int align = TQt::AlignVCenter|TQt::AlignLeft;
int marg = ( useBox || footerDrawBg ) ? innerMargin : 0; int marg = ( useBox || footerDrawBg ) ? innerMargin : 0;
if ( useBox ) marg += boxWidth; if ( useBox ) marg += boxWidth;
TQString s; TQString s;
@ -455,7 +455,7 @@ bool KatePrinter::print (KateDocument *doc)
s = footerTagList[i]; s = footerTagList[i];
if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s);
align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); align = TQt::AlignVCenter|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight);
} }
} }
} // done footer } // done footer
@ -524,7 +524,7 @@ bool KatePrinter::print (KateDocument *doc)
paint.setFont( renderer.config()->fontStruct()->myFontBold ); paint.setFont( renderer.config()->fontStruct()->myFontBold );
TQRect _r; TQRect _r;
paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y, paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y,
Qt::AlignTop|Qt::AlignHCenter, TQt::AlignTop|TQt::AlignHCenter,
i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r ); i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r );
int _w = pdmWidth - (_marg*2) - (innerMargin*2); int _w = pdmWidth - (_marg*2) - (innerMargin*2);
int _x = _marg + innerMargin; int _x = _marg + innerMargin;
@ -543,7 +543,7 @@ bool KatePrinter::print (KateDocument *doc)
paint.setPen( renderer.attribute(_i)->textColor() ); paint.setPen( renderer.attribute(_i)->textColor() );
paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) ); paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) );
paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(), paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(),
Qt::AlignVCenter|Qt::AlignLeft, _d->name, -1, &_r ); TQt::AlignVCenter|TQt::AlignLeft, _d->name, -1, &_r );
_i++; _i++;
if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight(); if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight();
++_it; ++_it;
@ -561,7 +561,7 @@ bool KatePrinter::print (KateDocument *doc)
paint.setPen( renderer.config()->lineNumberColor() ); paint.setPen( renderer.config()->lineNumberColor() );
paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y, paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y,
lineNumberWidth, renderer.fontHeight(), lineNumberWidth, renderer.fontHeight(),
Qt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); TQt::AlignRight, TQString("%1").arg( lineCount + 1 ) );
} }
endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap); endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap);
@ -721,7 +721,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
lo2->addWidget( btnChooseFont ); lo2->addWidget( btnChooseFont );
connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) ); connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) );
// header // header
gbHeader = new TQGroupBox( 2, Qt::Horizontal, i18n("Header Properties"), this ); gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this );
lo->addWidget( gbHeader ); lo->addWidget( gbHeader );
TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader ); TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader );
@ -740,7 +740,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors ); cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors );
kcbtnHeaderBg = new KColorButton( hbHeaderColors ); kcbtnHeaderBg = new KColorButton( hbHeaderColors );
gbFooter = new TQGroupBox( 2, Qt::Horizontal, i18n("Footer Properties"), this ); gbFooter = new TQGroupBox( 2, TQt::Horizontal, i18n("Footer Properties"), this );
lo->addWidget( gbFooter ); lo->addWidget( gbFooter );
// footer // footer
@ -922,7 +922,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons
cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this ); cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this );
lo->addWidget( cbEnableBox ); lo->addWidget( cbEnableBox );
gbBoxProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Box Properties"), this ); gbBoxProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Box Properties"), this );
lo->addWidget( gbBoxProps ); lo->addWidget( gbBoxProps );
TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps ); TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps );

@ -352,7 +352,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
// Draws the dashed underline at the start of a folded block of text. // Draws the dashed underline at the start of a folded block of text.
if (range->startsInvisibleBlock) { if (range->startsInvisibleBlock) {
paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, Qt::DashLine)); paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, TQt::DashLine));
paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1); paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1);
} }

@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
// same std colors like in KateDocument::markColor // same std colors like in KateDocument::markColor
TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount()); TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount());
Q_ASSERT(mark.size() > 6); Q_ASSERT(mark.size() > 6);
mark[0] = Qt::blue; mark[0] = TQt::blue;
mark[1] = Qt::red; mark[1] = TQt::red;
mark[2] = Qt::yellow; mark[2] = TQt::yellow;
mark[3] = Qt::magenta; mark[3] = TQt::magenta;
mark[4] = Qt::gray; mark[4] = TQt::gray;
mark[5] = Qt::green; mark[5] = TQt::green;
mark[6] = Qt::red; mark[6] = TQt::red;
SchemaColors c; SchemaColors c;
TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
@ -1153,7 +1153,7 @@ void KateStyleListView::unsetColor( int c )
void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
{ {
if ( dynamic_cast<KateStyleListItem*>(i) ) { if ( dynamic_cast<KateStyleListItem*>(i) ) {
if ( btn == Qt::LeftButton && c > 0 ) { if ( btn == TQt::LeftButton && c > 0 ) {
// map pos to item/column and call KateStyleListItem::activate(col, pos) // map pos to item/column and call KateStyleListItem::activate(col, pos)
((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
} }

@ -729,8 +729,8 @@ bool KateSearch::doSearch( const TQString& text )
if (arbitraryHLExample) { if (arbitraryHLExample) {
KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this); KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this);
hl->setBold(); hl->setBold();
hl->setTextColor(Qt::white); hl->setTextColor(TQt::white);
hl->setBGColor(Qt::black); hl->setBGColor(TQt::black);
// destroy the highlight upon change // destroy the highlight upon change
connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated())); connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated()));
m_arbitraryHLList->append(hl); m_arbitraryHLList->append(hl);

@ -124,7 +124,7 @@ KateTemplateHandler::KateTemplateHandler(
connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) );
( *this ) ( Qt::Key_Tab ); ( *this ) ( TQt::Key_Tab );
} }
KateTemplateHandler::~KateTemplateHandler() KateTemplateHandler::~KateTemplateHandler()
@ -283,7 +283,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor )
bool KateTemplateHandler::operator() ( KKey key ) bool KateTemplateHandler::operator() ( KKey key )
{ {
if ( key==Qt::Key_Tab ) if ( key==TQt::Key_Tab )
{ {
m_currentTabStop++; m_currentTabStop++;

@ -241,10 +241,10 @@ void KateView::setupActions()
" when the view is resized.")); " when the view is resized."));
// setup Tools menu // setup Tools menu
a=new TDEAction(i18n("&Indent"), "format-indent-more", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new TDEAction(i18n("&Unindent"), "format-indent-less", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
@ -254,12 +254,12 @@ void KateView::setupActions()
a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
ac, "tools_comment"); ac, "tools_comment");
a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
ac, "tools_uncomment"); ac, "tools_uncomment");
a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
@ -269,17 +269,17 @@ void KateView::setupActions()
ac, "tools_toggle_write_lock" ); ac, "tools_toggle_write_lock" );
a->setWhatsThis( i18n("Lock/unlock the document for writing") ); a->setWhatsThis( i18n("Lock/unlock the document for writing") );
a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(uppercase()), ac, "tools_uppercase" ); TQT_SLOT(uppercase()), ac, "tools_uppercase" );
a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(lowercase()), ac, "tools_lowercase" ); TQT_SLOT(lowercase()), ac, "tools_lowercase" );
a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(capitalize()), ac, "tools_capitalize" ); TQT_SLOT(capitalize()), ac, "tools_capitalize" );
a->setWhatsThis( i18n("Capitalize the selection, or the word under the " a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") ); "cursor if no text is selected.") );
@ -288,7 +288,7 @@ void KateView::setupActions()
TQT_SLOT( killLine() ), ac, "tools_delete_line"); TQT_SLOT( killLine() ), ac, "tools_delete_line");
a->setWhatsThis(i18n("Use this to delete the current line.")); a->setWhatsThis(i18n("Use this to delete the current line."));
a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, TQT_TQOBJECT(this),
TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
a->setWhatsThis(i18n("Use this to join lines together.")); a->setWhatsThis(i18n("Use this to join lines together."));
} }

@ -73,7 +73,7 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent,
void KateScrollBar::mousePressEvent(TQMouseEvent* e) void KateScrollBar::mousePressEvent(TQMouseEvent* e)
{ {
if (e->button() == Qt::MidButton) if (e->button() == TQt::MidButton)
m_middleMouseDown = true; m_middleMouseDown = true;
TQScrollBar::mousePressEvent(e); TQScrollBar::mousePressEvent(e);
@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e)
{ {
TQScrollBar::mouseMoveEvent(e); TQScrollBar::mouseMoveEvent(e);
if (e->state() | Qt::LeftButton) if (e->state() | TQt::LeftButton)
redrawMarks(); redrawMarks();
} }
@ -953,7 +953,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
if (realLine > -1) if (realLine > -1)
if (m_viewInternal->lineRanges[z].startCol == 0) { if (m_viewInternal->lineRanges[z].startCol == 0) {
if (m_lineNumbersOn) if (m_lineNumbersOn)
p.drawText( lnX + 1, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); p.drawText( lnX + 1, y, lnWidth-4, h, TQt::AlignRight|TQt::AlignVCenter, TQString("%1").arg( realLine + 1 ) );
} else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) {
p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow); p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow);
} }
@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
{ {
BorderArea area = positionToArea( e->pos() ); BorderArea area = positionToArea( e->pos() );
if( area == IconBorder) { if( area == IconBorder) {
if (e->button() == Qt::LeftButton) { if (e->button() == TQt::LeftButton) {
if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) { if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) {
if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() ) if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() )
m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() ); m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() );
@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
} }
} }
else else
if (e->button() == Qt::RightButton) { if (e->button() == TQt::RightButton) {
showMarkMenu( cursorOnLine, TQCursor::pos() ); showMarkMenu( cursorOnLine, TQCursor::pos() );
} }
} }

@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// //
// scrollbar for lines // scrollbar for lines
// //
m_lineScroll = new KateScrollBar(Qt::Vertical, this); m_lineScroll = new KateScrollBar(TQt::Vertical, this);
m_lineScroll->show(); m_lineScroll->show();
m_lineScroll->setTracking (true); m_lineScroll->setTracking (true);
@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// //
// scrollbar for columns // scrollbar for columns
// //
m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view); m_columnScroll = new TQScrollBar(TQt::Horizontal,m_view);
// hide the column scrollbar in the dynamic word wrap mode // hide the column scrollbar in the dynamic word wrap mode
if (m_view->dynWordWrap()) if (m_view->dynWordWrap())
@ -1216,7 +1216,7 @@ void KateViewInternal::moveEdge( Bias bias, bool sel )
void KateViewInternal::home( bool sel ) void KateViewInternal::home( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -1257,7 +1257,7 @@ void KateViewInternal::home( bool sel )
void KateViewInternal::end( bool sel ) void KateViewInternal::end( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -1687,7 +1687,7 @@ int KateViewInternal::lineMaxCol(const KateLineRange& range)
void KateViewInternal::cursorUp(bool sel) void KateViewInternal::cursorUp(bool sel)
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Up, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Up, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -1754,7 +1754,7 @@ void KateViewInternal::cursorUp(bool sel)
void KateViewInternal::cursorDown(bool sel) void KateViewInternal::cursorDown(bool sel)
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Down, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Down, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -1889,7 +1889,7 @@ void KateViewInternal::setAutoCenterLines(int viewLines, bool updateView)
void KateViewInternal::pageUp( bool sel ) void KateViewInternal::pageUp( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageUp, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageUp, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -1938,7 +1938,7 @@ void KateViewInternal::pageUp( bool sel )
void KateViewInternal::pageDown( bool sel ) void KateViewInternal::pageDown( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageDown, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageDown, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -2025,7 +2025,7 @@ void KateViewInternal::bottom( bool sel )
void KateViewInternal::top_home( bool sel ) void KateViewInternal::top_home( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -2037,7 +2037,7 @@ void KateViewInternal::top_home( bool sel )
void KateViewInternal::bottom_end( bool sel ) void KateViewInternal::bottom_end( bool sel )
{ {
if (m_view->m_codeCompletion->codeCompletionVisible()) { if (m_view->m_codeCompletion->codeCompletionVisible()) {
TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0);
m_view->m_codeCompletion->handleKey(&e); m_view->m_codeCompletion->handleKey(&e);
return; return;
} }
@ -2465,7 +2465,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e )
m_view->m_codeCompletion->abortCompletion(); m_view->m_codeCompletion->abortCompletion();
} }
if ((k->key() == Qt::Key_Escape) && !m_view->config()->persistentSelection() ) if ((k->key() == TQt::Key_Escape) && !m_view->config()->persistentSelection() )
{ {
m_view->clearSelection(); m_view->clearSelection();
return true; return true;
@ -2525,7 +2525,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
kdDebug (13030) << "hint around" << endl; kdDebug (13030) << "hint around" << endl;
if( e->key() == Key_Enter || e->key() == Key_Return || if( e->key() == Key_Enter || e->key() == Key_Return ||
(key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { (key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) {
m_view->m_codeCompletion->doComplete(); m_view->m_codeCompletion->doComplete();
e->accept(); e->accept();
return; return;
@ -2538,14 +2538,14 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
return; return;
} }
if ((key == Qt::Key_Return) || (key == Qt::Key_Enter)) if ((key == TQt::Key_Return) || (key == TQt::Key_Enter))
{ {
m_view->keyReturn(); m_view->keyReturn();
e->accept(); e->accept();
return; return;
} }
if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) if ((key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter))
{ {
uint ln = cursor.line(); uint ln = cursor.line();
int col = cursor.col(); int col = cursor.col();
@ -2573,7 +2573,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
return; return;
} }
if (key == Qt::Key_Backspace || key == SHIFT + Qt::Key_Backspace) if (key == TQt::Key_Backspace || key == SHIFT + TQt::Key_Backspace)
{ {
m_view->backspace(); m_view->backspace();
e->accept(); e->accept();
@ -2584,7 +2584,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
return; return;
} }
if (key == Qt::Key_Tab || key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) if (key == TQt::Key_Tab || key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab)
{ {
if (m_doc->invokeTabInterceptor(key)) { if (m_doc->invokeTabInterceptor(key)) {
e->accept(); e->accept();
@ -2592,7 +2592,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
} else } else
if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents) if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents)
{ {
if( key == Qt::Key_Tab ) if( key == TQt::Key_Tab )
{ {
if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode)) if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode))
m_doc->indent( m_view, cursor.line(), 1 ); m_doc->indent( m_view, cursor.line(), 1 );
@ -2609,7 +2609,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
return; return;
} }
if (key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) if (key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab)
{ {
m_doc->indent( m_view, cursor.line(), -1 ); m_doc->indent( m_view, cursor.line(), -1 );
e->accept(); e->accept();
@ -2693,7 +2693,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
{ {
switch (e->button()) switch (e->button())
{ {
case Qt::LeftButton: case TQt::LeftButton:
m_selChangedByUser = false; m_selChangedByUser = false;
if (possibleTripleClick) if (possibleTripleClick)
@ -2820,7 +2820,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
{ {
switch (e->button()) switch (e->button())
{ {
case Qt::LeftButton: case TQt::LeftButton:
m_selectionMode = Word; m_selectionMode = Word;
if ( e->state() & TQt::ShiftButton ) if ( e->state() & TQt::ShiftButton )
@ -2927,7 +2927,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
{ {
switch (e->button()) switch (e->button())
{ {
case Qt::LeftButton: case TQt::LeftButton:
m_selectionMode = Default; m_selectionMode = Default;
// selStartCached.setLine( -1 ); // selStartCached.setLine( -1 );
@ -2956,7 +2956,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
e->accept (); e->accept ();
break; break;
case Qt::MidButton: case TQt::MidButton:
placeCursor( e->pos() ); placeCursor( e->pos() );
if( m_doc->isReadWrite() ) if( m_doc->isReadWrite() )
@ -2977,7 +2977,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
{ {
if( e->state() & Qt::LeftButton ) if( e->state() & TQt::LeftButton )
{ {
if (dragInfo.state == diPending) if (dragInfo.state == diPending)
{ {
@ -3276,7 +3276,7 @@ void KateViewInternal::wheelEvent(TQWheelEvent* e)
} }
else else
{ {
if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != TQt::Horizontal)
{ {
// React to this as a vertical event // React to this as a vertical event
if ( e->state() & ShiftButton ) if ( e->state() & ShiftButton )

@ -225,7 +225,7 @@ bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e )
if( e->type() == TQEvent::KeyPress ) { if( e->type() == TQEvent::KeyPress ) {
TQKeyEvent *keyEvent = (TQKeyEvent*)e; TQKeyEvent *keyEvent = (TQKeyEvent*)e;
if( keyEvent->key() == Qt::Key_Escape ) if( keyEvent->key() == TQt::Key_Escape )
quitToView( TQString::null ); quitToView( TQString::null );
} }

@ -747,7 +747,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
#ifdef KBUILDSYCOCA_GUI #ifdef KBUILDSYCOCA_GUI
silent = args->isSet("silent"); silent = args->isSet("silent");
showprogress = args->isSet("showprogress"); showprogress = args->isSet("showprogress");
TQLabel progress( TQString("<p><br><nobr> %1 </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder | Qt::WStyle_Customize| Qt::WStyle_Title ); TQLabel progress( TQString("<p><br><nobr> %1 </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", TQt::WType_Dialog | TQt::WStyle_DialogBorder | TQt::WStyle_Customize| TQt::WStyle_Title );
TQString capt = i18n("TDE Configuration Manager"); TQString capt = i18n("TDE Configuration Manager");
if (!silent) { if (!silent) {
if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload"))) if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload")))

@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topLayout->addLayout( selectedLayout ); topLayout->addLayout( selectedLayout );
topLayout->setSpacing( spacingHint() ); topLayout->setSpacing( spacingHint() );
TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"), TQGroupBox *selectedGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Selected"),
topWidget ); topWidget );
selectedLayout->addWidget( selectedGroup ); selectedLayout->addWidget( selectedGroup );

@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e ) void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
{ {
if (m_useCompletion && (e->button() == Qt::MidButton)) if (m_useCompletion && (e->button() == TQt::MidButton))
{ {
m_smartPaste = true; m_smartPaste = true;
KLineEdit::mouseReleaseEvent(e); KLineEdit::mouseReleaseEvent(e);

@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
TQFrame *topFrame = plainPage(); TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"),
topFrame ); topFrame );
topLayout->addWidget( mButtonGroup ); topLayout->addWidget( mButtonGroup );

@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
TQFrame *topFrame = plainPage(); TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"),
topFrame ); topFrame );
mButtonGroup->setRadioButtonExclusive( true ); mButtonGroup->setRadioButtonExclusive( true );
topLayout->addWidget( mButtonGroup ); topLayout->addWidget( mButtonGroup );

@ -213,7 +213,7 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_AUTHBOX ) { if ( mFlags & W_AUTHBOX ) {
TQButtonGroup *authbox = TQButtonGroup *authbox =
new TQButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this ); new TQButtonGroup( 3, TQt::Horizontal, i18n( "Authentication" ), this );
mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" ); mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" );
mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" ); mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" );

@ -342,7 +342,7 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
layout->setAutoAdd( true ); layout->setAutoAdd( true );
mSrc = src; mDst = dst; mSrc = src; mDst = dst;
mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, mCacheGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Offline Cache Policy"), page ); i18n("Offline Cache Policy"), page );
TQRadioButton *bt; TQRadioButton *bt;

@ -247,7 +247,7 @@ bool ResourceSql::save( Ticket * )
(*it).prefix() + "','" + (*it).prefix() + "','" +
(*it).suffix() + "','" + (*it).suffix() + "','" +
(*it).nickName() + "','" + (*it).nickName() + "','" +
(*it).birthday().toString( Qt::ISODate ) + "','" + (*it).birthday().toString( TQt::ISODate ) + "','" +
(*it).mailer() + "','" + (*it).mailer() + "','" +
TQString::number( (*it).timeZone().offset() ) + "','" + TQString::number( (*it).timeZone().offset() ) + "','" +
TQString::number( (*it).geo().latitude() ) + "','" + TQString::number( (*it).geo().latitude() ) + "','" +
@ -257,7 +257,7 @@ bool ResourceSql::save( Ticket * )
(*it).organization() + "','" + (*it).organization() + "','" +
(*it).note() + "','" + (*it).note() + "','" +
(*it).productId() + "','" + (*it).productId() + "','" +
(*it).revision().toString( Qt::ISODate ) + "','" + (*it).revision().toString( TQt::ISODate ) + "','" +
(*it).sortString() + "','" + (*it).sortString() + "','" +
(*it).url().url() + "')" (*it).url().url() + "')"
); );

@ -42,7 +42,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
mainLayout->setMargin( marginHint() ); mainLayout->setMargin( marginHint() );
TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this ); TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal, this );
groupBox->setTitle( i18n( "Resources" ) ); groupBox->setTitle( i18n( "Resources" ) );
mResourceId = new TDEListBox( groupBox ); mResourceId = new TDEListBox( groupBox );

@ -121,7 +121,7 @@ TQString Field::value( const TDEABC::Addressee &a )
return a.preferredEmail(); return a.preferredEmail();
case FieldImpl::Birthday: case FieldImpl::Birthday:
if ( a.birthday().isValid() ) if ( a.birthday().isValid() )
return a.birthday().date().toString( Qt::ISODate ); return a.birthday().date().toString( TQt::ISODate );
else else
return TQString::null; return TQString::null;
case FieldImpl::Url: case FieldImpl::Url:
@ -362,7 +362,7 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
return true; return true;
} }
case FieldImpl::Birthday: case FieldImpl::Birthday:
a.setBirthday( TQDate::fromString( value, Qt::ISODate ) ); a.setBirthday( TQDate::fromString( value, TQt::ISODate ) );
return true; return true;
case FieldImpl::CustomField: case FieldImpl::CustomField:
a.insertCustom( mImpl->app(), mImpl->key(), value ); a.insertCustom( mImpl->app(), mImpl->key(), value );

@ -629,7 +629,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
// Set the valid period // Set the valid period
TQPalette cspl = _ca_validFrom->palette(); TQPalette cspl = _ca_validFrom->palette();
if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) { if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -638,7 +638,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
_ca_validFrom->setText(c->getNotBefore()); _ca_validFrom->setText(c->getNotBefore());
cspl = _ca_validUntil->palette(); cspl = _ca_validUntil->palette();
if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) { if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -670,7 +670,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
// Set the valid period // Set the valid period
TQPalette cspl = _p12_validFrom->palette(); TQPalette cspl = _p12_validFrom->palette();
if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) { if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -679,7 +679,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
_p12_validFrom->setText(c->getNotBefore()); _p12_validFrom->setText(c->getNotBefore());
cspl = _p12_validUntil->palette(); cspl = _p12_validUntil->palette();
if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) { if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));

@ -201,7 +201,7 @@ KonfUpdate::log()
} }
} }
(*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " "; (*m_textStream) << TQDateTime::currentDateTime().toString( TQt::ISODate ) << " ";
return *m_textStream; return *m_textStream;
} }

@ -16,7 +16,7 @@
symbols may now refer to different variables symbols may now refer to different variables
(e.g. if X11 #defined NoButton, after this file (e.g. if X11 #defined NoButton, after this file
is included NoButton would no longer be X11's is included NoButton would no longer be X11's
NoButton, but Qt::NoButton instead). At this time, NoButton, but TQt::NoButton instead). At this time,
there's no conflict known that could cause problems. there's no conflict known that could cause problems.
The original X11 symbols are still accessible The original X11 symbols are still accessible

@ -18,7 +18,7 @@ sed -n '/enum Key/!d
| sed -n 's/\s*Key_/{ "/ | sed -n 's/\s*Key_/{ "/
s/,.*$/ },/ s/,.*$/ },/
s/ =/",/ s/ =/",/
s/Key_/Qt::Key_/ s/Key_/TQt::Key_/
$s/.*/& }/ $s/.*/& }/
p' \ p' \
> kckey_a > kckey_a

@ -76,7 +76,7 @@ const KKeys kde_KKEYS[NB_KEYS] = {
{ "Direction_L", 0x1059 }, { "Direction_L", 0x1059 },
{ "Direction_R", 0x1060 }, { "Direction_R", 0x1060 },
{ "Space", 0x20 }, // translated { "Space", 0x20 }, // translated
{ "Any", Qt::Key_Space }, { "Any", TQt::Key_Space },
{ "Exclam", 0x21 }, // translated { "Exclam", 0x21 }, // translated
{ "QuoteDbl", 0x22 }, { "QuoteDbl", 0x22 },
{ "NumberSign", 0x23 }, // translated { "NumberSign", 0x23 }, // translated

@ -873,7 +873,7 @@ public:
* the key-binding simply simply @p sum up the values of the * the key-binding simply simply @p sum up the values of the
* modifier and the actual key. For example, to use CTRL+E as * modifier and the actual key. For example, to use CTRL+E as
* a key binding for one of the items, you would simply supply * a key binding for one of the items, you would simply supply
* @p "Qt::CtrlButton + Qt::Key_E" as the second argument to this * @p "TQt::CtrlButton + TQt::Key_E" as the second argument to this
* function. * function.
* *
* @param item the feature whose key-binding needs to be set: * @param item the feature whose key-binding needs to be set:

@ -743,7 +743,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect)
TQPainter p(widget); TQPainter p(widget);
// Use NotROP to avoid having to repaint the pixmap each time. // Use NotROP to avoid having to repaint the pixmap each time.
p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); p.setPen(TQPen(TQt::black, 2, TQt::DotLine));
p.setRasterOp(TQt::NotROP); p.setRasterOp(TQt::NotROP);
// The spacing between the rects we draw. // The spacing between the rects we draw.

@ -111,7 +111,7 @@ class TDECORE_EXPORT KKeyNative
/** /**
* Returns the qt key code. * Returns the qt key code.
* @return the qt key code or 0 if there is no key set. * @return the qt key code or 0 if there is no key set.
* @see Qt::Key * @see TQt::Key
*/ */
int keyCodeQt() const; int keyCodeQt() const;

@ -48,14 +48,14 @@
#else #else
# include <kckey.h> # include <kckey.h>
# define X11_ONLY(arg) # define X11_ONLY(arg)
# define XK_ISO_Left_Tab Qt::Key_Backtab # define XK_ISO_Left_Tab TQt::Key_Backtab
# define XK_BackSpace Qt::Key_Backspace # define XK_BackSpace TQt::Key_Backspace
# define XK_Sys_Req Qt::Key_SysReq # define XK_Sys_Req TQt::Key_SysReq
# define XK_Caps_Lock Qt::Key_CapsLock # define XK_Caps_Lock TQt::Key_CapsLock
# define XK_Num_Lock Qt::Key_NumLock # define XK_Num_Lock TQt::Key_NumLock
# define XK_Scroll_Lock Qt::Key_ScrollLock # define XK_Scroll_Lock TQt::Key_ScrollLock
# define XK_Prior Qt::Key_Prior # define XK_Prior TQt::Key_Prior
# define XK_Next Qt::Key_Next # define XK_Next TQt::Key_Next
#endif #endif
namespace KKeyServer namespace KKeyServer
@ -108,9 +108,9 @@ struct TransKey {
static ModInfo g_rgModInfo[KKey::MOD_FLAG_COUNT] = static ModInfo g_rgModInfo[KKey::MOD_FLAG_COUNT] =
{ {
{ KKey::SHIFT, Qt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() }, { KKey::SHIFT, TQt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() },
{ KKey::CTRL, Qt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() }, { KKey::CTRL, TQt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() },
{ KKey::ALT, Qt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() }, { KKey::ALT, TQt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() },
{ KKey::WIN, KKey::QtWIN, X11_ONLY(Mod4Mask) I18N_NOOP("Win"), TQString() } { KKey::WIN, KKey::QtWIN, X11_ONLY(Mod4Mask) I18N_NOOP("Win"), TQString() }
}; };
@ -156,85 +156,85 @@ static SymVariation g_rgSymVariation[] =
// These are the X equivalents to the Qt keycodes 0x1000 - 0x1026 // These are the X equivalents to the Qt keycodes 0x1000 - 0x1026
static const TransKey g_rgQtToSymX[] = static const TransKey g_rgQtToSymX[] =
{ {
{ Qt::Key_Escape, XK_Escape }, { TQt::Key_Escape, XK_Escape },
{ Qt::Key_Tab, XK_Tab }, { TQt::Key_Tab, XK_Tab },
{ Qt::Key_Backtab, XK_ISO_Left_Tab }, { TQt::Key_Backtab, XK_ISO_Left_Tab },
{ Qt::Key_Backspace, XK_BackSpace }, { TQt::Key_Backspace, XK_BackSpace },
{ Qt::Key_Return, XK_Return }, { TQt::Key_Return, XK_Return },
{ Qt::Key_Enter, XK_KP_Enter }, { TQt::Key_Enter, XK_KP_Enter },
{ Qt::Key_Insert, XK_Insert }, { TQt::Key_Insert, XK_Insert },
{ Qt::Key_Delete, XK_Delete }, { TQt::Key_Delete, XK_Delete },
{ Qt::Key_Pause, XK_Pause }, { TQt::Key_Pause, XK_Pause },
#ifdef sun #ifdef sun
{ Qt::Key_Print, XK_F22 }, { TQt::Key_Print, XK_F22 },
#else #else
{ Qt::Key_Print, XK_Print }, { TQt::Key_Print, XK_Print },
#endif #endif
{ Qt::Key_SysReq, XK_Sys_Req }, { TQt::Key_SysReq, XK_Sys_Req },
{ Qt::Key_Home, XK_Home }, { TQt::Key_Home, XK_Home },
{ Qt::Key_End, XK_End }, { TQt::Key_End, XK_End },
{ Qt::Key_Left, XK_Left }, { TQt::Key_Left, XK_Left },
{ Qt::Key_Up, XK_Up }, { TQt::Key_Up, XK_Up },
{ Qt::Key_Right, XK_Right }, { TQt::Key_Right, XK_Right },
{ Qt::Key_Down, XK_Down }, { TQt::Key_Down, XK_Down },
{ TQt::Key_Prior, XK_Prior }, { TQt::Key_Prior, XK_Prior },
{ TQt::Key_Next, XK_Next }, { TQt::Key_Next, XK_Next },
//{ Qt::Key_Shift, 0 }, //{ TQt::Key_Shift, 0 },
//{ Qt::Key_Control, 0 }, //{ TQt::Key_Control, 0 },
//{ Qt::Key_Meta, 0 }, //{ TQt::Key_Meta, 0 },
//{ Qt::Key_Alt, 0 }, //{ TQt::Key_Alt, 0 },
{ Qt::Key_CapsLock, XK_Caps_Lock }, { TQt::Key_CapsLock, XK_Caps_Lock },
{ Qt::Key_NumLock, XK_Num_Lock }, { TQt::Key_NumLock, XK_Num_Lock },
{ Qt::Key_ScrollLock, XK_Scroll_Lock }, { TQt::Key_ScrollLock, XK_Scroll_Lock },
{ Qt::Key_F1, XK_F1 }, { TQt::Key_F1, XK_F1 },
{ Qt::Key_F2, XK_F2 }, { TQt::Key_F2, XK_F2 },
{ Qt::Key_F3, XK_F3 }, { TQt::Key_F3, XK_F3 },
{ Qt::Key_F4, XK_F4 }, { TQt::Key_F4, XK_F4 },
{ Qt::Key_F5, XK_F5 }, { TQt::Key_F5, XK_F5 },
{ Qt::Key_F6, XK_F6 }, { TQt::Key_F6, XK_F6 },
{ Qt::Key_F7, XK_F7 }, { TQt::Key_F7, XK_F7 },
{ Qt::Key_F8, XK_F8 }, { TQt::Key_F8, XK_F8 },
{ Qt::Key_F9, XK_F9 }, { TQt::Key_F9, XK_F9 },
{ Qt::Key_F10, XK_F10 }, { TQt::Key_F10, XK_F10 },
{ Qt::Key_F11, XK_F11 }, { TQt::Key_F11, XK_F11 },
{ Qt::Key_F12, XK_F12 }, { TQt::Key_F12, XK_F12 },
{ Qt::Key_F13, XK_F13 }, { TQt::Key_F13, XK_F13 },
{ Qt::Key_F14, XK_F14 }, { TQt::Key_F14, XK_F14 },
{ Qt::Key_F15, XK_F15 }, { TQt::Key_F15, XK_F15 },
{ Qt::Key_F16, XK_F16 }, { TQt::Key_F16, XK_F16 },
{ Qt::Key_F17, XK_F17 }, { TQt::Key_F17, XK_F17 },
{ Qt::Key_F18, XK_F18 }, { TQt::Key_F18, XK_F18 },
{ Qt::Key_F19, XK_F19 }, { TQt::Key_F19, XK_F19 },
{ Qt::Key_F20, XK_F20 }, { TQt::Key_F20, XK_F20 },
{ Qt::Key_F21, XK_F21 }, { TQt::Key_F21, XK_F21 },
{ Qt::Key_F22, XK_F22 }, { TQt::Key_F22, XK_F22 },
{ Qt::Key_F23, XK_F23 }, { TQt::Key_F23, XK_F23 },
{ Qt::Key_F24, XK_F24 }, { TQt::Key_F24, XK_F24 },
{ Qt::Key_F25, XK_F25 }, { TQt::Key_F25, XK_F25 },
{ Qt::Key_F26, XK_F26 }, { TQt::Key_F26, XK_F26 },
{ Qt::Key_F27, XK_F27 }, { TQt::Key_F27, XK_F27 },
{ Qt::Key_F28, XK_F28 }, { TQt::Key_F28, XK_F28 },
{ Qt::Key_F29, XK_F29 }, { TQt::Key_F29, XK_F29 },
{ Qt::Key_F30, XK_F30 }, { TQt::Key_F30, XK_F30 },
{ Qt::Key_F31, XK_F31 }, { TQt::Key_F31, XK_F31 },
{ Qt::Key_F32, XK_F32 }, { TQt::Key_F32, XK_F32 },
{ Qt::Key_F33, XK_F33 }, { TQt::Key_F33, XK_F33 },
{ Qt::Key_F34, XK_F34 }, { TQt::Key_F34, XK_F34 },
{ Qt::Key_F35, XK_F35 }, { TQt::Key_F35, XK_F35 },
{ Qt::Key_Super_L, XK_Super_L }, { TQt::Key_Super_L, XK_Super_L },
{ Qt::Key_Super_R, XK_Super_R }, { TQt::Key_Super_R, XK_Super_R },
{ Qt::Key_Menu, XK_Menu }, { TQt::Key_Menu, XK_Menu },
{ Qt::Key_Hyper_L, XK_Hyper_L }, { TQt::Key_Hyper_L, XK_Hyper_L },
{ Qt::Key_Hyper_R, XK_Hyper_R }, { TQt::Key_Hyper_R, XK_Hyper_R },
{ Qt::Key_Help, XK_Help }, { TQt::Key_Help, XK_Help },
//{ Qt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11 //{ TQt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11
//{ Qt::Key_Direction_R, XK_Direction_R }, //{ TQt::Key_Direction_R, XK_Direction_R },
{ '/', XK_KP_Divide }, { '/', XK_KP_Divide },
{ '*', XK_KP_Multiply }, { '*', XK_KP_Multiply },
{ '-', XK_KP_Subtract }, { '-', XK_KP_Subtract },
{ '+', XK_KP_Add }, { '+', XK_KP_Add },
{ Qt::Key_Return, XK_KP_Enter } { TQt::Key_Return, XK_KP_Enter }
#if TQT_VERSION >= 0x030100 #if TQT_VERSION >= 0x030100
// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
@ -285,46 +285,46 @@ static const TransKey g_rgQtToSymX[] =
#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ #define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */
// end of XF86keysyms.h // end of XF86keysyms.h
, ,
{ Qt::Key_Standby, XF86XK_Standby }, { TQt::Key_Standby, XF86XK_Standby },
{ Qt::Key_VolumeDown, XF86XK_AudioLowerVolume }, { TQt::Key_VolumeDown, XF86XK_AudioLowerVolume },
{ Qt::Key_VolumeMute, XF86XK_AudioMute }, { TQt::Key_VolumeMute, XF86XK_AudioMute },
{ Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, { TQt::Key_VolumeUp, XF86XK_AudioRaiseVolume },
{ Qt::Key_MediaPlay, XF86XK_AudioPlay }, { TQt::Key_MediaPlay, XF86XK_AudioPlay },
{ Qt::Key_MediaStop, XF86XK_AudioStop }, { TQt::Key_MediaStop, XF86XK_AudioStop },
{ TQt::Key_MediaPrev, XF86XK_AudioPrev }, { TQt::Key_MediaPrev, XF86XK_AudioPrev },
{ Qt::Key_MediaNext, XF86XK_AudioNext }, { TQt::Key_MediaNext, XF86XK_AudioNext },
{ Qt::Key_HomePage, XF86XK_HomePage }, { TQt::Key_HomePage, XF86XK_HomePage },
{ Qt::Key_LaunchMail, XF86XK_Mail }, { TQt::Key_LaunchMail, XF86XK_Mail },
{ Qt::Key_Search, XF86XK_Search }, { TQt::Key_Search, XF86XK_Search },
{ Qt::Key_MediaRecord, XF86XK_AudioRecord }, { TQt::Key_MediaRecord, XF86XK_AudioRecord },
{ Qt::Key_LaunchMedia, XF86XK_AudioMedia }, { TQt::Key_LaunchMedia, XF86XK_AudioMedia },
{ Qt::Key_Launch1, XF86XK_Calculator }, { TQt::Key_Launch1, XF86XK_Calculator },
{ Qt::Key_Back, XF86XK_Back }, { TQt::Key_Back, XF86XK_Back },
{ Qt::Key_Forward, XF86XK_Forward }, { TQt::Key_Forward, XF86XK_Forward },
{ Qt::Key_Stop, XF86XK_Stop }, { TQt::Key_Stop, XF86XK_Stop },
{ Qt::Key_Refresh, XF86XK_Refresh }, { TQt::Key_Refresh, XF86XK_Refresh },
{ Qt::Key_Favorites, XF86XK_Favorites }, { TQt::Key_Favorites, XF86XK_Favorites },
{ Qt::Key_Launch0, XF86XK_MyComputer }, { TQt::Key_Launch0, XF86XK_MyComputer },
{ Qt::Key_OpenUrl, XF86XK_OpenURL }, { TQt::Key_OpenUrl, XF86XK_OpenURL },
{ Qt::Key_Launch2, XF86XK_Launch0 }, { TQt::Key_Launch2, XF86XK_Launch0 },
{ Qt::Key_Launch3, XF86XK_Launch1 }, { TQt::Key_Launch3, XF86XK_Launch1 },
{ Qt::Key_Launch4, XF86XK_Launch2 }, { TQt::Key_Launch4, XF86XK_Launch2 },
{ Qt::Key_Launch5, XF86XK_Launch3 }, { TQt::Key_Launch5, XF86XK_Launch3 },
{ Qt::Key_Launch6, XF86XK_Launch4 }, { TQt::Key_Launch6, XF86XK_Launch4 },
{ Qt::Key_Launch7, XF86XK_Launch5 }, { TQt::Key_Launch7, XF86XK_Launch5 },
{ Qt::Key_Launch8, XF86XK_Launch6 }, { TQt::Key_Launch8, XF86XK_Launch6 },
{ Qt::Key_Launch9, XF86XK_Launch7 }, { TQt::Key_Launch9, XF86XK_Launch7 },
{ Qt::Key_LaunchA, XF86XK_Launch8 }, { TQt::Key_LaunchA, XF86XK_Launch8 },
{ Qt::Key_LaunchB, XF86XK_Launch9 }, { TQt::Key_LaunchB, XF86XK_Launch9 },
{ Qt::Key_LaunchC, XF86XK_LaunchA }, { TQt::Key_LaunchC, XF86XK_LaunchA },
{ Qt::Key_LaunchD, XF86XK_LaunchB }, { TQt::Key_LaunchD, XF86XK_LaunchB },
{ Qt::Key_LaunchE, XF86XK_LaunchC }, { TQt::Key_LaunchE, XF86XK_LaunchC },
{ Qt::Key_LaunchF, XF86XK_LaunchD }, { TQt::Key_LaunchF, XF86XK_LaunchD },
{ Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, { TQt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp },
{ Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, { TQt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown },
{ Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, { TQt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff },
{ Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, { TQt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp },
{ Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, { TQt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown },
#endif #endif
}; };
#endif //Q_WS_X11 #endif //Q_WS_X11
@ -416,7 +416,7 @@ bool Sym::initQt( int keyQt )
{ {
int symQt = keyQt & 0xffff; int symQt = keyQt & 0xffff;
if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) { if( (keyQt & TQt::UNICODE_ACCEL) || symQt < 0x1000 ) {
m_sym = TQChar(symQt).lower().unicode(); m_sym = TQChar(symQt).lower().unicode();
return true; return true;
} }
@ -433,8 +433,8 @@ bool Sym::initQt( int keyQt )
} }
m_sym = 0; m_sym = 0;
if( symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt && if( symQt != TQt::Key_Shift && symQt != TQt::Key_Control && symQt != TQt::Key_Alt &&
symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R ) symQt != TQt::Key_Meta && symQt != TQt::Key_Direction_L && symQt != TQt::Key_Direction_R )
kdDebug(125) << "Sym::initQt( " << TQString::number(keyQt,16) << " ): failed to convert key." << endl; kdDebug(125) << "Sym::initQt( " << TQString::number(keyQt,16) << " ): failed to convert key." << endl;
return false; return false;
#elif defined(Q_WS_MACX) #elif defined(Q_WS_MACX)
@ -495,7 +495,7 @@ int Sym::qt() const
return m_sym; return m_sym;
#elif defined(Q_WS_X11) #elif defined(Q_WS_X11)
if( m_sym < 0x3000 ) if( m_sym < 0x3000 )
return m_sym | Qt::UNICODE_ACCEL; return m_sym | TQt::UNICODE_ACCEL;
for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ )
if( g_rgQtToSymX[i].keySymX == m_sym ) if( g_rgQtToSymX[i].keySymX == m_sym )
@ -648,10 +648,10 @@ bool keyQtToMod( int keyQt, uint& mod )
{ {
mod = 0; mod = 0;
if( keyQt & Qt::SHIFT ) mod |= KKey::SHIFT; if( keyQt & TQt::SHIFT ) mod |= KKey::SHIFT;
if( keyQt & Qt::CTRL ) mod |= KKey::CTRL; if( keyQt & TQt::CTRL ) mod |= KKey::CTRL;
if( keyQt & Qt::ALT ) mod |= KKey::ALT; if( keyQt & TQt::ALT ) mod |= KKey::ALT;
if( keyQt & Qt::META ) mod |= KKey::WIN; if( keyQt & TQt::META ) mod |= KKey::WIN;
return true; return true;
} }
@ -688,9 +688,9 @@ bool modXToModQt( uint modX, int& modQt )
TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ) TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
{ {
int modQt = 0; int modQt = 0;
if (s & Qt::ShiftButton) modQt |= KKey::SHIFT; if (s & TQt::ShiftButton) modQt |= KKey::SHIFT;
if (s & Qt::ControlButton) modQt |= KKey::CTRL; if (s & TQt::ControlButton) modQt |= KKey::CTRL;
if (s & Qt::AltButton) modQt |= KKey::ALT; if (s & TQt::AltButton) modQt |= KKey::ALT;
return modQt; return modQt;
} }
@ -841,7 +841,7 @@ uint stringUserToMod( const TQString& mod )
if( keySymQt < 0x1000 ) { if( keySymQt < 0x1000 ) {
// For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'. // For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'.
// So convert it back to lowercase if SHIFT isn't held down. // So convert it back to lowercase if SHIFT isn't held down.
if( keySymQt >= Qt::Key_A && keySymQt <= Qt::Key_Z && !(keyCombQt & Qt::SHIFT) ) if( keySymQt >= TQt::Key_A && keySymQt <= TQt::Key_Z && !(keyCombQt & TQt::SHIFT) )
keySymQt = tolower( keySymQt ); keySymQt = tolower( keySymQt );
keySymX = keySymQt; keySymX = keySymQt;
} }

@ -71,7 +71,7 @@ namespace KKeyServer
* Initializes the symbol with the given Qt key code. * Initializes the symbol with the given Qt key code.
* @param keyQt the qt key code * @param keyQt the qt key code
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
*/ */
bool initQt( int keyQt ); bool initQt( int keyQt );
@ -153,7 +153,7 @@ namespace KKeyServer
* @param key the key to get the data from * @param key the key to get the data from
* @param bQt true to take the Qt keycode, false * @param bQt true to take the Qt keycode, false
* for the native key code * for the native key code
* @see Qt::Key * @see TQt::Key
* @see KKeyNative * @see KKeyNative
*/ */
bool init( const KKey& key, bool bQt ); bool init( const KKey& key, bool bQt );
@ -162,7 +162,7 @@ namespace KKeyServer
* Checks whether the key code is a native code. * Checks whether the key code is a native code.
* @return true if native code of the window system, * @return true if native code of the window system,
* false if it is a Qt keycode * false if it is a Qt keycode
* @see Qt::Key * @see TQt::Key
* @see KKeyNative * @see KKeyNative
*/ */
bool isNative() const { return m_code != CODE_FOR_QT; } bool isNative() const { return m_code != CODE_FOR_QT; }
@ -351,7 +351,7 @@ namespace KKeyServer
* @param keyQt the qt key code * @param keyQt the qt key code
* @param sym if successful, the symbol will be written here * @param sym if successful, the symbol will be written here
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
* @see Sym * @see Sym
*/ */
TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
@ -362,7 +362,7 @@ namespace KKeyServer
* @param keyQt the qt key code * @param keyQt the qt key code
* @param mod if successful, the modifiers will be written here * @param mod if successful, the modifiers will be written here
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
*/ */
TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
@ -371,7 +371,7 @@ namespace KKeyServer
* @param sym the symbol * @param sym the symbol
* @param keyQt if successful, the qt key code will be written here * @param keyQt if successful, the qt key code will be written here
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
* @see Sym * @see Sym
*/ */
TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
@ -383,7 +383,7 @@ namespace KKeyServer
* @param modQt the mask of Qt key code modifiers will be written here, * @param modQt the mask of Qt key code modifiers will be written here,
* if successful * if successful
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
* @see KKey * @see KKey
*/ */
TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); TDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
@ -406,7 +406,7 @@ namespace KKeyServer
* @param modQt the mask of Qt key code modifiers will be written here * @param modQt the mask of Qt key code modifiers will be written here
* if successful * if successful
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
*/ */
//wrapped for win32 //wrapped for win32
TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
@ -414,7 +414,7 @@ namespace KKeyServer
/** /**
* Converts the Qt-compatible button state to x11 modifier. * Converts the Qt-compatible button state to x11 modifier.
*/ */
TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s );
/** /**
* Converts the mask of ORed X11 modifiers to * Converts the mask of ORed X11 modifiers to
@ -435,7 +435,7 @@ namespace KKeyServer
* @param modX the mask of ORed X11 modifiers * @param modX the mask of ORed X11 modifiers
* @param symX if successful, the X11 symbol will be written here * @param symX if successful, the X11 symbol will be written here
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
* @see Sym * @see Sym
*/ */
TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );

@ -245,7 +245,7 @@ TQDateTime KTimezone::convert(const KTimezone *newZone, const TQDateTime &dateTi
::setenv("TZ", newZone->name().utf8(), 1); ::setenv("TZ", newZone->name().utf8(), 1);
tzset(); tzset();
TQDateTime remoteTime; TQDateTime remoteTime;
remoteTime.setTime_t(utc, Qt::LocalTime); remoteTime.setTime_t(utc, TQt::LocalTime);
// Now restore things // Now restore things
if (!originalZone) if (!originalZone)
@ -280,7 +280,7 @@ TQString KTimezone::name() const
return m_name; return m_name;
} }
int KTimezone::offset(Qt::TimeSpec basisSpec) const int KTimezone::offset(TQt::TimeSpec basisSpec) const
{ {
char *originalZone = ::getenv("TZ"); char *originalZone = ::getenv("TZ");
@ -290,7 +290,7 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
// Set the timezone and find out what time it is there compared to the basis. // Set the timezone and find out what time it is there compared to the basis.
::setenv("TZ", m_name.utf8(), 1); ::setenv("TZ", m_name.utf8(), 1);
tzset(); tzset();
TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); TQDateTime remoteTime = TQDateTime::currentDateTime(TQt::LocalTime);
int offset = remoteTime.secsTo(basisTime); int offset = remoteTime.secsTo(basisTime);
// Now restore things // Now restore things
@ -605,7 +605,7 @@ const KTimezone *KTimezones::local()
for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it) for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it)
{ {
KTimezone *zone = it.data(); KTimezone *zone = it.data();
int candidateOffset = QABS(zone->offset(Qt::LocalTime)); int candidateOffset = QABS(zone->offset(TQt::LocalTime));
if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset)) if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset))
{ {
// kdError() << "local=" << zone->name() << endl; // kdError() << "local=" << zone->name() << endl;

@ -156,7 +156,7 @@ public:
* *
* @return offset in seconds. * @return offset in seconds.
*/ */
int offset(Qt::TimeSpec basisSpec = Qt::UTC) const; int offset(TQt::TimeSpec basisSpec = TQt::UTC) const;
/** /**
* Returns the offset of the given timezone to UTC at the given * Returns the offset of the given timezone to UTC at the given

@ -334,8 +334,8 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
#ifdef Q_WS_X11 #ifdef Q_WS_X11
KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual, KUniqueApplication::KUniqueApplication(Display *display, TQt::HANDLE visual,
Qt::HANDLE colormap, bool allowStyles, bool configUnique) TQt::HANDLE colormap, bool allowStyles, bool configUnique)
: TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )), : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
DCOPObject(TDECmdLineArgs::about->appName()) DCOPObject(TDECmdLineArgs::about->appName())
{ {

@ -90,8 +90,8 @@ public:
* @since KDE 3.3 * @since KDE 3.3
*/ */
KUniqueApplication( Display *display, KUniqueApplication( Display *display,
Qt::HANDLE visual=0, TQt::HANDLE visual=0,
Qt::HANDLE colormap=0, TQt::HANDLE colormap=0,
bool allowStyles=true, bool allowStyles=true,
bool configUnique=false); bool configUnique=false);
#endif #endif

@ -57,7 +57,7 @@ public:
m_clipSVP = 0; m_clipSVP = 0;
m_fillColor = Qt::black; m_fillColor = TQt::black;
m_useFill = true; m_useFill = true;
m_useStroke = false; m_useStroke = false;

@ -49,7 +49,7 @@
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// //
// In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling // In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling
// This allows us to map the Win key to Qt::MetaButton, Qt does not know about // This allows us to map the Win key to TQt::MetaButton, Qt does not know about
// the Win key. // the Win key.
// //
// TDEAccelEventHandler::x11Event will generate an AccelOverride event. The // TDEAccelEventHandler::x11Event will generate an AccelOverride event. The

@ -74,7 +74,7 @@ class TDEAccelPrivate;
* // Insert an action "Scroll Up" which is associated with the "Up" key: * // Insert an action "Scroll Up" which is associated with the "Up" key:
* pAccel->insert( "Scroll Up", i18n("Scroll up"), * pAccel->insert( "Scroll Up", i18n("Scroll up"),
* i18n("Scroll up the current document by one line."), * i18n("Scroll up the current document by one line."),
* Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) ); * TQt::Key_Up, this, TQT_SLOT(slotScrollUp()) );
* // Insert an standard acclerator action. * // Insert an standard acclerator action.
* pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) ); * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) );
* *

@ -329,8 +329,8 @@ void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if ( !label->buddy() ) if ( !label->buddy() )
label = 0; label = 0;
else { else {
if ( label->textFormat() == Qt::RichText || if ( label->textFormat() == TQt::RichText ||
( label->textFormat() == Qt::AutoText && ( label->textFormat() == TQt::AutoText &&
TQStyleSheet::mightBeRichText( label->text() ) ) ) TQStyleSheet::mightBeRichText( label->text() ) ) )
label = 0; label = 0;
} }

@ -586,7 +586,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
} }
} }
// Ctrl-U deletes from start of line. // Ctrl-U deletes from start of line.
if (key == KKey(Qt::CTRL + Qt::Key_U)) if (key == KKey(TQt::CTRL + TQt::Key_U))
{ {
if (t == TQEvent::KeyPress) if (t == TQEvent::KeyPress)
{ {
@ -817,7 +817,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
d->m_KAppDCOPInterface = new KAppDCOPInterface(this); d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
} }
TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) : TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ), disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
@ -834,7 +834,7 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visu
d->m_KAppDCOPInterface = new KAppDCOPInterface(this); d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
} }
TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
bool allowStyles ) : bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
@ -853,7 +853,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
d->m_KAppDCOPInterface = new KAppDCOPInterface(this); d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
} }
TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
bool allowStyles, TDEInstance * _instance ) : bool allowStyles, TDEInstance * _instance ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
@ -2032,23 +2032,23 @@ Display* TDEApplication::openX11RGBADisplay() {
return dpy; return dpy;
} }
Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
getX11RGBAInformation(dpy); getX11RGBAInformation(dpy);
if (TDEApplication::isCompositionManagerAvailable() == true) { if (TDEApplication::isCompositionManagerAvailable() == true) {
return argb_x11_visual; return argb_x11_visual;
} }
else { else {
return (Qt::HANDLE)NULL; return (TQt::HANDLE)NULL;
} }
} }
Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
getX11RGBAInformation(dpy); getX11RGBAInformation(dpy);
if (TDEApplication::isCompositionManagerAvailable() == true) { if (TDEApplication::isCompositionManagerAvailable() == true) {
return argb_x11_colormap; return argb_x11_colormap;
} }
else { else {
return (Qt::HANDLE)NULL; return (TQt::HANDLE)NULL;
} }
} }
@ -2089,8 +2089,8 @@ void TDEApplication::getX11RGBAInformation(Display *dpy) {
} }
if( argb_visual ) { if( argb_visual ) {
argb_x11_visual = Qt::HANDLE( visual ); argb_x11_visual = TQt::HANDLE( visual );
argb_x11_colormap = Qt::HANDLE( colormap ); argb_x11_colormap = TQt::HANDLE( colormap );
argb_visual = true; argb_visual = true;
return; return;
} }
@ -2144,11 +2144,11 @@ Display* TDEApplication::openX11RGBADisplay() {
return 0; return 0;
} }
Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
return 0; return 0;
} }
Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
return 0; return 0;
} }
@ -2462,12 +2462,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
if (v > 128) if (v > 128)
// dark bg, light fg - need a darker disabled fg // dark bg, light fg - need a darker disabled fg
disfg = disfg.dark(lowlightVal); disfg = disfg.dark(lowlightVal);
else if (disfg != Qt::black) else if (disfg != TQt::black)
// light bg, dark fg - need a lighter disabled fg - but only if !black // light bg, dark fg - need a lighter disabled fg - but only if !black
disfg = disfg.light(highlightVal); disfg = disfg.light(highlightVal);
else else
// black fg - use darkgray disabled fg // black fg - use darkgray disabled fg
disfg = Qt::darkGray; disfg = TQt::darkGray;
TQColorGroup disabledgrp(disfg, background, TQColorGroup disabledgrp(disfg, background,
@ -2500,12 +2500,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
if (v > 128) if (v > 128)
// dark button, light buttonText - need a darker disabled buttonText // dark button, light buttonText - need a darker disabled buttonText
disbtntext = disbtntext.dark(lowlightVal); disbtntext = disbtntext.dark(lowlightVal);
else if (disbtntext != Qt::black) else if (disbtntext != TQt::black)
// light buttonText, dark button - need a lighter disabled buttonText - but only if !black // light buttonText, dark button - need a lighter disabled buttonText - but only if !black
disbtntext = disbtntext.light(highlightVal); disbtntext = disbtntext.light(highlightVal);
else else
// black button - use darkgray disabled buttonText // black button - use darkgray disabled buttonText
disbtntext = Qt::darkGray; disbtntext = TQt::darkGray;
disabledgrp.setColor(TQColorGroup::ButtonText, disbtntext); disabledgrp.setColor(TQColorGroup::ButtonText, disbtntext);
disabledgrp.setColor(TQColorGroup::Midlight, background.light(110)); disabledgrp.setColor(TQColorGroup::Midlight, background.light(110));
@ -2591,15 +2591,15 @@ void TDEApplication::propagateSettings(SettingsCategory arg)
TQApplication::setWheelScrollLines(num); TQApplication::setWheelScrollLines(num);
bool b = config->readBoolEntry("EffectAnimateMenu", false); bool b = config->readBoolEntry("EffectAnimateMenu", false);
TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, b); TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, b);
b = config->readBoolEntry("EffectFadeMenu", false); b = config->readBoolEntry("EffectFadeMenu", false);
TQApplication::setEffectEnabled( Qt::UI_FadeMenu, b); TQApplication::setEffectEnabled( TQt::UI_FadeMenu, b);
b = config->readBoolEntry("EffectAnimateCombo", false); b = config->readBoolEntry("EffectAnimateCombo", false);
TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, b); TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, b);
b = config->readBoolEntry("EffectAnimateTooltip", false); b = config->readBoolEntry("EffectAnimateTooltip", false);
TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, b); TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, b);
b = config->readBoolEntry("EffectFadeTooltip", false); b = config->readBoolEntry("EffectFadeTooltip", false);
TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, b); TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, b);
b = !config->readBoolEntry("EffectNoTooltip", false); b = !config->readBoolEntry("EffectNoTooltip", false);
TQToolTip::setGloballyEnabled( b ); TQToolTip::setGloballyEnabled( b );
@ -3632,7 +3632,7 @@ uint TDEApplication::mouseState()
return mousestate & 0xff00; return mousestate & 0xff00;
} }
Qt::ButtonState TDEApplication::keyboardMouseState() TQt::ButtonState TDEApplication::keyboardMouseState()
{ {
int ret = 0; int ret = 0;
#ifdef Q_WS_X11 #ifdef Q_WS_X11

@ -187,7 +187,7 @@ public:
* *
* @see RGBADisplay() * @see RGBADisplay()
*/ */
TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles); TDEApplication(Display *display, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles);
/** /**
* Constructor. Parses command-line arguments. Use this constructor when you * Constructor. Parses command-line arguments. Use this constructor when you
@ -212,7 +212,7 @@ public:
* *
* @since KDE 3.3 * @since KDE 3.3
*/ */
TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, TDEApplication(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0,
bool allowStyles=true); bool allowStyles=true);
/** /**
@ -984,14 +984,14 @@ public:
* *
* @return A pointer to the X11 display visual * @return A pointer to the X11 display visual
*/ */
Qt::HANDLE getX11RGBAVisual(Display *dpy); TQt::HANDLE getX11RGBAVisual(Display *dpy);
/** /**
* Returns the X11 display colormap * Returns the X11 display colormap
* *
* @return An X11 display colormap object * @return An X11 display colormap object
*/ */
Qt::HANDLE getX11RGBAColormap(Display *dpy); TQt::HANDLE getX11RGBAColormap(Display *dpy);
/** /**
* Returns whether or not X11 composition is available * Returns whether or not X11 composition is available
@ -1266,7 +1266,7 @@ protected:
/** /**
* @internal Used by KUniqueApplication * @internal Used by KUniqueApplication
*/ */
TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, TDEApplication( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap,
bool allowStyles, TDEInstance* _instance ); bool allowStyles, TDEInstance* _instance );
/** /**
@ -1353,8 +1353,8 @@ private:
bool argb_visual; bool argb_visual;
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
Qt::HANDLE argb_x11_visual; TQt::HANDLE argb_x11_visual;
Qt::HANDLE argb_x11_colormap; TQt::HANDLE argb_x11_colormap;
#endif #endif
public: public:

@ -187,7 +187,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
{ {
// If the class name of the widget wasn't in the monitored widgets map, then look for // If the class name of the widget wasn't in the monitored widgets map, then look for
// it again using the super class name. This fixes a problem with using QtRuby/Korundum // it again using the super class name. This fixes a problem with using QtRuby/Korundum
// widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even // widgets with TDEConfigXT where 'TQt::Widget' wasn't being seen a the real deal, even
// though it was a 'TQWidget'. // though it was a 'TQWidget'.
changedIt = changedMap.find(childWidget->metaObject()->superClassName()); changedIt = changedMap.find(childWidget->metaObject()->superClassName());
} }

@ -429,7 +429,7 @@ TQColor TDEGlobalSettings::alternateBackgroundColor()
TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base)
{ {
if (base == Qt::white) if (base == TQt::white)
return TQColor(238,246,255); return TQColor(238,246,255);
else else
{ {
@ -437,7 +437,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base
base.hsv( &h, &s, &v ); base.hsv( &h, &s, &v );
if (v > 128) if (v > 128)
return base.dark(106); return base.dark(106);
else if (base != Qt::black) else if (base != TQt::black)
return base.light(110); return base.light(110);
return TQColor(32,32,32); return TQColor(32,32,32);

@ -89,10 +89,10 @@ bool KKey::init( const TQKeySequence& key )
bool KKey::init( const TQKeyEvent* pEvent ) bool KKey::init( const TQKeyEvent* pEvent )
{ {
int keyQt = pEvent->key(); int keyQt = pEvent->key();
if( pEvent->state() & TQt::ShiftButton ) keyQt |= Qt::SHIFT; if( pEvent->state() & TQt::ShiftButton ) keyQt |= TQt::SHIFT;
if( pEvent->state() & TQt::ControlButton ) keyQt |= Qt::CTRL; if( pEvent->state() & TQt::ControlButton ) keyQt |= TQt::CTRL;
if( pEvent->state() & TQt::AltButton ) keyQt |= Qt::ALT; if( pEvent->state() & TQt::AltButton ) keyQt |= TQt::ALT;
if( pEvent->state() & TQt::MetaButton ) keyQt |= Qt::META; if( pEvent->state() & TQt::MetaButton ) keyQt |= TQt::META;
return init( keyQt ); return init( keyQt );
} }

@ -45,7 +45,7 @@ class TDECORE_EXPORT KKey
* @see ModFlag * @see ModFlag
*/ */
enum { MOD_FLAG_COUNT = 4 }; enum { MOD_FLAG_COUNT = 4 };
enum { QtWIN = (Qt::META) }; enum { QtWIN = (TQt::META) };
/** /**
* Flags to represent the modifiers. You can combine modifiers * Flags to represent the modifiers. You can combine modifiers
* by ORing them. * by ORing them.
@ -68,7 +68,7 @@ class TDECORE_EXPORT KKey
/** /**
* Creates a new key for the given Qt key code. * Creates a new key for the given Qt key code.
* @param keyQt the qt keycode * @param keyQt the qt keycode
* @see Qt::Key * @see TQt::Key
*/ */
KKey( int keyQt ); KKey( int keyQt );
@ -115,7 +115,7 @@ class TDECORE_EXPORT KKey
* Initializes the key with the given Qt key code. * Initializes the key with the given Qt key code.
* @param keyQt the qt keycode * @param keyQt the qt keycode
* @return true if successful, false otherwise * @return true if successful, false otherwise
* @see Qt::Key * @see TQt::Key
*/ */
bool init( int keyQt ); bool init( int keyQt );
@ -217,7 +217,7 @@ class TDECORE_EXPORT KKey
/** /**
* Returns the qt key code. * Returns the qt key code.
* @return the qt key code or 0 if there is no key set. * @return the qt key code or 0 if there is no key set.
* @see Qt::Key * @see TQt::Key
*/ */
int keyCodeQt() const; int keyCodeQt() const;
@ -469,7 +469,7 @@ class TDECORE_EXPORT KKeySequence
*/ */
bool operator < ( const KKeySequence& seq ) const bool operator < ( const KKeySequence& seq ) const
{ return compare( seq ) < 0; } { return compare( seq ) < 0; }
// TODO: consider adding Qt::SequenceMatch matches(...) methods for TQKeySequence equivalence // TODO: consider adding TQt::SequenceMatch matches(...) methods for TQKeySequence equivalence
/** /**
* Converts this key sequence to a TQKeySequence. * Converts this key sequence to a TQKeySequence.
@ -480,7 +480,7 @@ class TDECORE_EXPORT KKeySequence
/** /**
* Returns the qt key code of the first key. * Returns the qt key code of the first key.
* @return the qt key code of the first key * @return the qt key code of the first key
* @see Qt::Key * @see TQt::Key
* @see KKey::keyCodeQt() * @see KKey::keyCodeQt()
*/ */
int keyCodeQt() const; int keyCodeQt() const;
@ -561,7 +561,7 @@ class TDECORE_EXPORT TDEShortcut
* Creates a new shortcut with the given Qt key code * Creates a new shortcut with the given Qt key code
* as the only key sequence. * as the only key sequence.
* @param keyQt the qt keycode * @param keyQt the qt keycode
* @see Qt::Key * @see TQt::Key
*/ */
TDEShortcut( int keyQt ); TDEShortcut( int keyQt );
@ -622,7 +622,7 @@ class TDECORE_EXPORT TDEShortcut
* Initializes the shortcut with the given Qt key code * Initializes the shortcut with the given Qt key code
* as the only key sequence. * as the only key sequence.
* @param keyQt the qt keycode * @param keyQt the qt keycode
* @see Qt::Key * @see TQt::Key
*/ */
bool init( int keyQt ); bool init( int keyQt );
@ -686,7 +686,7 @@ class TDECORE_EXPORT TDEShortcut
* Returns the key code of the first key sequence, or * Returns the key code of the first key sequence, or
* null if there is no first key sequence. * null if there is no first key sequence.
* @return the key code of the first sequence's first key * @return the key code of the first sequence's first key
* @see Qt::Key * @see TQt::Key
* @see KKeySequence::keyCodeQt() * @see KKeySequence::keyCodeQt()
*/ */
int keyCodeQt() const; int keyCodeQt() const;

@ -104,8 +104,8 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
if( iItem == -1 ) { if( iItem == -1 ) {
// Let Up and Down keys navigate menu, // Let Up and Down keys navigate menu,
// And permit Enter, Return to select the item. // And permit Enter, Return to select the item.
if( pEvent->key() == Qt::Key_Up || pEvent->key() == Qt::Key_Down || if( pEvent->key() == TQt::Key_Up || pEvent->key() == TQt::Key_Down ||
pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return ) pEvent->key() == TQt::Key_Enter || pEvent->key() == TQt::Key_Return )
TQPopupMenu::keyPressEvent( pEvent ); TQPopupMenu::keyPressEvent( pEvent );
else else
close(); close();

@ -50,59 +50,59 @@ struct TDEStdAccelInfo
static TDEStdAccelInfo g_infoStdAccel[] = static TDEStdAccelInfo g_infoStdAccel[] =
{ {
{AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false },
{ Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false }, { Open, I18N_NOOP("Open"), 0, TQt::CTRL+TQt::Key_O, 0, 0, 0, TDEShortcut(), false },
{ New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false }, { New, I18N_NOOP("New"), 0, TQt::CTRL+TQt::Key_N, 0, 0, 0, TDEShortcut(), false },
{ Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false }, { Close, I18N_NOOP("Close"), 0, TQt::CTRL+TQt::Key_W, TQt::CTRL+TQt::Key_Escape, 0, TQt::CTRL+TQt::Key_W, TDEShortcut(), false },
{ Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false }, { Save, I18N_NOOP("Save"), 0, TQt::CTRL+TQt::Key_S, 0, 0, 0, TDEShortcut(), false },
{ Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false }, { Print, I18N_NOOP("Print"), 0, TQt::CTRL+TQt::Key_P, 0, 0, 0, TDEShortcut(), false },
{ Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false }, { Quit, I18N_NOOP("Quit"), 0, TQt::CTRL+TQt::Key_Q, 0, 0, 0, TDEShortcut(), false },
{AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false },
{ Undo, I18N_NOOP("Undo"), 0, Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, { Undo, I18N_NOOP("Undo"), 0, TQt::CTRL+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false },
{ Redo, I18N_NOOP("Redo"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, { Redo, I18N_NOOP("Redo"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false },
{ Cut, I18N_NOOP("Cut"), 0, Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false }, { Cut, I18N_NOOP("Cut"), 0, TQt::CTRL+TQt::Key_X, 0, TQt::SHIFT+TQt::Key_Delete, 0, TDEShortcut(), false },
{ Copy, I18N_NOOP("Copy"), 0, Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false }, { Copy, I18N_NOOP("Copy"), 0, TQt::CTRL+TQt::Key_C, 0, TQt::CTRL+TQt::Key_Insert, 0, TDEShortcut(), false },
{ Paste, I18N_NOOP("Paste"), 0, Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, { Paste, I18N_NOOP("Paste"), 0, TQt::CTRL+TQt::Key_V, 0, TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false },
{ PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false },
{ SelectAll, "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, { SelectAll, "SelectAll", I18N_NOOP("Select All"), TQt::CTRL+TQt::Key_A, 0, 0, 0, TDEShortcut(), false },
{ Deselect, I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, { Deselect, I18N_NOOP("Deselect"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_A, 0, 0, 0, TDEShortcut(), false },
{ DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false }, { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), TQt::CTRL+TQt::Key_Backspace, 0, 0, 0, TDEShortcut(), false },
{ DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0, 0, 0, TDEShortcut(), false }, { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), TQt::CTRL+TQt::Key_Delete, 0, 0, 0, TDEShortcut(), false },
{ Find, I18N_NOOP("Find"), 0, Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, { Find, I18N_NOOP("Find"), 0, TQt::CTRL+TQt::Key_F, 0, 0, 0, TDEShortcut(), false },
{ FindNext, "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, { FindNext, "FindNext", I18N_NOOP("Find Next"), TQt::Key_F3, 0, 0, 0, TDEShortcut(), false },
{ FindPrev, "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), TQt::SHIFT+TQt::Key_F3, 0, 0, 0, TDEShortcut(), false },
{ Replace, I18N_NOOP("Replace"), 0, Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false }, { Replace, I18N_NOOP("Replace"), 0, TQt::CTRL+TQt::Key_R, 0, 0, 0, TDEShortcut(), false },
{AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false },
{ Home, I18N_NOOP2("Opposite to End","Home"), 0, Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false }, { Home, I18N_NOOP2("Opposite to End","Home"), 0, TQt::CTRL+TQt::Key_Home, 0, TQt::Key_HomePage, 0, TDEShortcut(), false },
{ End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false }, { End, I18N_NOOP("End"), 0, TQt::CTRL+TQt::Key_End, 0, 0, 0, TDEShortcut(), false },
{ BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false}, { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), TQt::Key_Home, 0, 0, 0, TDEShortcut(), false},
{ EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false}, { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), TQt::Key_End, 0, 0, 0, TDEShortcut(), false},
{ Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false }, { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false },
{ Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, TDEShortcut(), false }, { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, TDEShortcut(), false },
{ GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false }, { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), TQt::CTRL+TQt::Key_G, 0, 0, 0, TDEShortcut(), false },
{ AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false }, { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), TQt::CTRL+TQt::Key_B, 0, 0, 0, TDEShortcut(), false },
{ ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false }, { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), TQt::CTRL+TQt::Key_Plus, 0, 0, 0, TDEShortcut(), false },
{ ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false }, { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), TQt::CTRL+TQt::Key_Minus, 0, 0, 0, TDEShortcut(), false },
{ Up, I18N_NOOP("Up"), 0, Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, { Up, I18N_NOOP("Up"), 0, TQt::ALT+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
{ Back, I18N_NOOP("Back"), 0, Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false }, { Back, I18N_NOOP("Back"), 0, TQt::ALT+TQt::Key_Left, 0, TQt::Key_Back, 0, TDEShortcut(), false },
{ Forward, I18N_NOOP("Forward"), 0, Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false }, { Forward, I18N_NOOP("Forward"), 0, TQt::ALT+TQt::Key_Right, 0, TQt::Key_Forward, 0, TDEShortcut(), false },
{ Reload, I18N_NOOP("Reload"), 0, Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false }, { Reload, I18N_NOOP("Reload"), 0, TQt::Key_F5, 0, TQt::Key_Refresh, 0, TDEShortcut(), false },
{ PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false }, { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), TQt::Key_Menu, 0, 0, 0, TDEShortcut(), false },
{ ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false }, { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), TQt::CTRL+TQt::Key_M, 0, 0, 0, TDEShortcut(), false },
{ BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false }, { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), TQt::CTRL+TQt::Key_Left, 0, 0, 0, TDEShortcut(), false },
{ ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false }, { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), TQt::CTRL+TQt::Key_Right, 0, 0, 0, TDEShortcut(), false },
{ TabNext, I18N_NOOP("Activate Next Tab"), 0, Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false }, { TabNext, I18N_NOOP("Activate Next Tab"), 0, TQt::CTRL+TQt::Key_Period, 0, TQt::CTRL+TQt::Key_BracketRight, 0, TDEShortcut(), false },
{ TabPrev, I18N_NOOP("Activate Previous Tab"), 0, Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false }, { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, TQt::CTRL+TQt::Key_Comma, 0, TQt::CTRL+TQt::Key_BracketLeft, 0, TDEShortcut(), false },
{ FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), TQt::CTRL+TQt::SHIFT+TQt::Key_F, 0, 0, 0, TDEShortcut(), false },
{AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false },
{ Help, I18N_NOOP("Help"), 0, Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, { Help, I18N_NOOP("Help"), 0, TQt::Key_F1, 0, 0, 0, TDEShortcut(), false },
{ WhatsThis, "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), TQt::SHIFT+TQt::Key_F1, 0, 0, 0, TDEShortcut(), false },
{AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false },
{ TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false }, { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), TQt::CTRL+TQt::Key_E, 0, 0, 0, TDEShortcut(), false },
{ PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), TQt::CTRL+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
{ NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), TQt::CTRL+TQt::Key_Down, 0, 0, 0, TDEShortcut(), false },
{ SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false }, { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), TQt::CTRL+TQt::Key_T, 0, 0, 0, TDEShortcut(), false },
{ RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
{ RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), TQt::Key_Down, 0, 0, 0, TDEShortcut(), false },
{ AccelNone, 0, 0, 0, 0, 0, 0, TDEShortcut(), false } { AccelNone, 0, 0, 0, 0, 0, 0, TDEShortcut(), false }
}; };

@ -64,7 +64,7 @@ public:
TQVariant v( 0.12345 ); TQVariant v( 0.12345 );
kdDebug() << "Variant: " << v << endl; kdDebug() << "Variant: " << v << endl;
v = TQPen( Qt::red ); v = TQPen( TQt::red );
kdDebug() << "Variant: " << v << endl; kdDebug() << "Variant: " << v << endl;
TQByteArray data( 6 ); TQByteArray data( 6 );

@ -22,8 +22,8 @@ int main(int argc, char *argv[])
// Find some offsets for Europe/London. // Find some offsets for Europe/London.
const char *london = "Europe/London"; const char *london = "Europe/London";
timezone = timezones.zone(london); timezone = timezones.zone(london);
TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", Qt::ISODate)); TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", TQt::ISODate));
TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", Qt::ISODate)); TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", TQt::ISODate));
printf( "%s winter timezone offset should be 0: %d\n", london, timezone->offset(winter) ); printf( "%s winter timezone offset should be 0: %d\n", london, timezone->offset(winter) );
printf( "%s summer timezone offset should be 3600: %d\n", london, timezone->offset(summer) ); printf( "%s summer timezone offset should be 3600: %d\n", london, timezone->offset(summer) );
@ -34,13 +34,13 @@ int main(int argc, char *argv[])
const char *gmtBeforePst = "2005-10-30T01:00:00"; const char *gmtBeforePst = "2005-10-30T01:00:00";
const char *gmtAfterPst = "2005-12-01T00:00:00"; const char *gmtAfterPst = "2005-12-01T00:00:00";
TQString result; TQString result;
result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, Qt::ISODate)).toString(Qt::ISODate); result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, TQt::ISODate)).toString(TQt::ISODate);
printf( "BST before PDT, %s should be 2005-03-27T15:00:00: %s\n", bstBeforePdt, result.latin1() ); printf( "BST before PDT, %s should be 2005-03-27T15:00:00: %s\n", bstBeforePdt, result.latin1() );
result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, Qt::ISODate)).toString(Qt::ISODate); result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, TQt::ISODate)).toString(TQt::ISODate);
printf( "BST and PDT, %s should be 2005-04-30T16:00:00: %s\n", bstAfterPdt, result.latin1() ); printf( "BST and PDT, %s should be 2005-04-30T16:00:00: %s\n", bstAfterPdt, result.latin1() );
result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, Qt::ISODate)).toString(Qt::ISODate); result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, TQt::ISODate)).toString(TQt::ISODate);
printf( "GMT before PST, %s should be 2005-10-29T17:00:00: %s\n", gmtBeforePst, result.latin1() ); printf( "GMT before PST, %s should be 2005-10-29T17:00:00: %s\n", gmtBeforePst, result.latin1() );
result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, Qt::ISODate)).toString(Qt::ISODate); result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, TQt::ISODate)).toString(TQt::ISODate);
printf( "GMT and PST, %s should be 2005-11-30T16:00:00: %s\n", gmtAfterPst, result.latin1() ); printf( "GMT and PST, %s should be 2005-11-30T16:00:00: %s\n", gmtAfterPst, result.latin1() );
printf( "Latitude 89 should be valid: %svalid\n", KTimezone::isValidLatitude(89.0) ? "" : "in"); printf( "Latitude 89 should be valid: %svalid\n", KTimezone::isValidLatitude(89.0) ? "" : "in");
printf( "Latitude 91 should be invalid: %svalid\n", KTimezone::isValidLatitude(91.0) ? "" : "in"); printf( "Latitude 91 should be invalid: %svalid\n", KTimezone::isValidLatitude(91.0) ? "" : "in");

@ -27,13 +27,13 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
int y2 = y+h-1; int y2 = y+h-1;
p->fillRect(x+1, y+1, w-2, h-2, p->fillRect(x+1, y+1, w-2, h-2,
fill ? *fill : g.brush(TQColorGroup::Button)); fill ? *fill : g.brush(TQColorGroup::Button));
p->setPen(sunken ? Qt::black : g.light()); p->setPen(sunken ? TQt::black : g.light());
p->drawLine(x, y, x2-1, y); p->drawLine(x, y, x2-1, y);
p->drawLine(x, y, x, y2-1); p->drawLine(x, y, x, y2-1);
p->setPen(sunken ? g.midlight() : g.mid()); p->setPen(sunken ? g.midlight() : g.mid());
p->drawLine(x+1, y2-1, x2-1, y2-1); p->drawLine(x+1, y2-1, x2-1, y2-1);
p->drawLine(x2-1, y+1, x2-1, y2-1); p->drawLine(x2-1, y+1, x2-1, y2-1);
p->setPen(sunken ? g.light() : Qt::black); p->setPen(sunken ? g.light() : TQt::black);
p->drawLine(x, y2, x2, y2); p->drawLine(x, y2, x2, y2);
p->drawLine(x2, y, x2, y2); p->drawLine(x2, y, x2, y2);
p->setPen(oldPen); p->setPen(oldPen);
@ -161,10 +161,10 @@ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool
3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 }; 3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 };
if(clear) if(clear)
p->fillRect(x, y, w, h, TQBrush(Qt::color0, Qt::SolidPattern)); p->fillRect(x, y, w, h, TQBrush(TQt::color0, TQt::SolidPattern));
TQBrush fillBrush(Qt::color1, Qt::SolidPattern); TQBrush fillBrush(TQt::color1, TQt::SolidPattern);
p->setPen(Qt::color1); p->setPen(TQt::color1);
if(w > 16 && h > 16){ if(w > 16 && h > 16){
int x2 = x+w-1; int x2 = x+w-1;
int y2 = y+h-1; int y2 = y+h-1;
@ -223,7 +223,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
blackColor, whiteColor}; blackColor, whiteColor};
TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(),
Qt::black, Qt::white}; TQt::black, TQt::white};
int i; int i;
for(i=0; i < 6; ++i){ for(i=0; i < 6; ++i){
@ -246,7 +246,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
blackColor, whiteColor}; blackColor, whiteColor};
TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(),
Qt::black, Qt::white}; TQt::black, TQt::white};
int i; int i;
TQBitmap b; TQBitmap b;

@ -125,7 +125,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
* @c \#include @c <kdrawutil.h> * @c \#include @c <kdrawutil.h>
* *
* Paints the pixels covered by a round button of the given size with * Paints the pixels covered by a round button of the given size with
* Qt::color1. This function is useful in TQStyle::drawControlMask(). * TQt::color1. This function is useful in TQStyle::drawControlMask().
* *
* @param p The painter to use for drawing the button. * @param p The painter to use for drawing the button.
* @param x The X coordinate of the button. * @param x The X coordinate of the button.
@ -133,7 +133,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
* @param w The width of the button. * @param w The width of the button.
* @param h The height of the button. * @param h The height of the button.
* @param clear Whether to clear the rectangle specified by @p (x, y, w, h) to * @param clear Whether to clear the rectangle specified by @p (x, y, w, h) to
* Qt::color0 before drawing the mask. * TQt::color0 before drawing the mask.
*/ */
TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false); TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);

@ -2820,7 +2820,7 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold)
data = (unsigned int *)img.tqcolorTable(); data = (unsigned int *)img.tqcolorTable();
} }
for(i=0; i < count; ++i) for(i=0; i < count; ++i)
data[i] = intensityValue(data[i]) < threshold ? TQColor(Qt::black).rgb() : TQColor(Qt::white).rgb(); data[i] = intensityValue(data[i]) < threshold ? TQColor(TQt::black).rgb() : TQColor(TQt::white).rgb();
} }
void KImageEffect::hull(const int x_offset, const int y_offset, void KImageEffect::hull(const int x_offset, const int y_offset,

@ -42,7 +42,7 @@ class KPixmapSplitterPrivate;
* splitter.setItemSize( TQSize( 20, 10 )); * splitter.setItemSize( TQSize( 20, 10 ));
* *
* TQPixmap item( 20, 10 ); * TQPixmap item( 20, 10 );
* item.fill( Qt::white ); * item.fill( TQt::white );
* TQRect rect = splitter.coordinates( 4 ); * TQRect rect = splitter.coordinates( 4 );
* if ( !rect.isEmpty() ) * if ( !rect.isEmpty() )
* bitBlt( &item, TQPoint(0,0), &somePixmap, rect, CopyROP ); * bitBlt( &item, TQPoint(0,0), &somePixmap, rect, CopyROP );

@ -537,7 +537,7 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
break; break;
default: default:
p->fillRect(r, Qt::yellow); // Something really bad happened - highlight. p->fillRect(r, TQt::yellow); // Something really bad happened - highlight.
break; break;
} }
} }
@ -1937,7 +1937,7 @@ bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, Cont
TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame );
TQRect r = pe->rect(); TQRect r = pe->rect();
if (toolbar && toolbar->orientation() == Qt::Vertical) if (toolbar && toolbar->orientation() == TQt::Vertical)
horizontal = false; horizontal = false;
if (horizontal) { if (horizontal) {

@ -624,7 +624,7 @@ public:
* keys below represents the allowable modifier parameters for this * keys below represents the allowable modifier parameters for this
* method (note: this was not documented properly in earlier versions): * method (note: this was not documented properly in earlier versions):
* *
* Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
* *
* Parameters: * Parameters:
* *
@ -709,7 +709,7 @@ public:
* return false. The list of keys below represents the allowable * return false. The list of keys below represents the allowable
* modifier parameters for this method (warning: this was not documented * modifier parameters for this method (warning: this was not documented
* properly in earlier versions): * properly in earlier versions):
* Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
* *
* Parameters: * Parameters:
* *

@ -210,7 +210,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid()); p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
p->setPen(palette().active().text()); p->setPen(palette().active().text());
p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr); p->drawText(0,height*lineno,linenoWidth,height,TQt::AlignRight,linenoStr);
TQColor bgColor; TQColor bgColor;
TQColor textColor; TQColor textColor;
@ -232,7 +232,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor); p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
p->setPen(textColor); p->setPen(textColor);
p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height, p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height,
Qt::AlignLeft,m_lines[lineno]); TQt::AlignLeft,m_lines[lineno]);
} }
int remainingTop = height*(lastLine+1); int remainingTop = height*(lastLine+1);
@ -333,7 +333,7 @@ EvalMultiLineEdit::EvalMultiLineEdit(TQWidget *parent)
void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e) void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
{ {
if (e->key() == Qt::Key_Return) { if (e->key() == TQt::Key_Return) {
if (hasSelectedText()) { if (hasSelectedText()) {
m_code = selectedText(); m_code = selectedText();
} else { } else {
@ -374,7 +374,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5); TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5);
// frame list & code // frame list & code
TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget); TQSplitter *hsplitter = new TQSplitter(TQt::Vertical,mainWidget);
TQSplitter *vsplitter = new TQSplitter(hsplitter); TQSplitter *vsplitter = new TQSplitter(hsplitter);
TQFont font(TDEGlobalSettings::fixedFont()); TQFont font(TDEGlobalSettings::fixedFont());
@ -443,20 +443,20 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_actionCollection->setInstance(this); m_actionCollection->setInstance(this);
// Venkman use F12, KDevelop F10 // Venkman use F12, KDevelop F10
TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12))); TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
scNext.append(KKeySequence(KKey(Qt::Key_F10))); scNext.append(KKeySequence(KKey(TQt::Key_F10)));
m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()), m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
m_actionCollection,"next"); m_actionCollection,"next");
m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()), m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
m_actionCollection,"step"); m_actionCollection,"step");
// Venkman use F5, Kdevelop F9 // Venkman use F5, Kdevelop F9
TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5))); TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
scCont.append(KKeySequence(KKey(Qt::Key_F9))); scCont.append(KKeySequence(KKey(TQt::Key_F9)));
m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()), m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont"); m_actionCollection,"cont");
m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()), m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop"); m_actionCollection,"stop");
m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()), m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext"); m_actionCollection,"breaknext");

@ -1018,12 +1018,12 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
// handle tabbing out, either from a single or repeated key event. // handle tabbing out, either from a single or repeated key event.
if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) { if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) { if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
if (widget) if (widget)
static_cast<FocusHandleWidget *>(widget) static_cast<FocusHandleWidget *>(widget)
->focusNextPrev(k->key() == Qt::Key_Tab); ->focusNextPrev(k->key() == TQt::Key_Tab);
TQFocusEvent::resetReason(); TQFocusEvent::resetReason();
evt->setDefaultHandled(); evt->setDefaultHandled();
} }
@ -1119,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true; act = true;
} }
if (act) if (act)
@ -1143,7 +1143,7 @@ void HTMLButtonElementImpl::activate()
void HTMLButtonElementImpl::click() void HTMLButtonElementImpl::click()
{ {
TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
} }
@ -1359,7 +1359,7 @@ void HTMLInputElementImpl::select( )
void HTMLInputElementImpl::click() void HTMLInputElementImpl::click()
{ {
TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,0, 1); dispatchMouseEvent(&me,0, 1);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
} }
@ -1801,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true; act = true;
} }
if (act) if (act)
@ -1917,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt)
else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT || else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT ||
evt->id() == EventImpl::KEYPRESS_EVENT ) ) { evt->id() == EventImpl::KEYPRESS_EVENT ) ) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true; act = true;
} }

@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
state |= TQt::MetaButton; state |= TQt::MetaButton;
if ( e->button() == 0 ) if ( e->button() == 0 )
button = Qt::LeftButton; button = TQt::LeftButton;
else if ( e->button() == 1 ) else if ( e->button() == 1 )
button = Qt::MidButton; button = TQt::MidButton;
else if ( e->button() == 2 ) else if ( e->button() == 2 )
button = Qt::RightButton; button = TQt::RightButton;
} }
else if ( k ) else if ( k )
{ {
@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
void HTMLAnchorElementImpl::click() void HTMLAnchorElementImpl::click()
{ {
TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
} }

@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
d->tmplabel = new TQLabel( this ); d->tmplabel = new TQLabel( this );
d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak ); d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak );
d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->tmplabel->show(); d->tmplabel->show();

@ -695,9 +695,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
if (scrollsOverflow() && m_layer) { if (scrollsOverflow() && m_layer) {
// For overflow:scroll blocks, ensure we have both scrollbars in place always. // For overflow:scroll blocks, ensure we have both scrollbars in place always.
if (style()->overflowX() == OSCROLL) if (style()->overflowX() == OSCROLL)
m_layer->showScrollbar( Qt::Horizontal, true ); m_layer->showScrollbar( TQt::Horizontal, true );
if (style()->overflowY() == OSCROLL) if (style()->overflowY() == OSCROLL)
m_layer->showScrollbar( Qt::Vertical, true ); m_layer->showScrollbar( TQt::Vertical, true );
} }
setContainsPageBreak(false); setContainsPageBreak(false);

@ -644,8 +644,8 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color) void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color)
{ {
p->setPen(TQPen(TQColor(color), 1, Qt::DotLine)); p->setPen(TQPen(TQColor(color), 1, TQt::DotLine));
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawRect(_tx, _ty, m_width, m_height); p->drawRect(_tx, _ty, m_width, m_height);
} }

@ -99,25 +99,25 @@ void RenderFormElement::layout()
setNeedsLayout(false); setNeedsLayout(false);
} }
Qt::AlignmentFlags RenderFormElement::textAlignment() const TQt::AlignmentFlags RenderFormElement::textAlignment() const
{ {
switch (style()->textAlign()) { switch (style()->textAlign()) {
case LEFT: case LEFT:
case TDEHTML_LEFT: case TDEHTML_LEFT:
return Qt::AlignLeft; return TQt::AlignLeft;
case RIGHT: case RIGHT:
case TDEHTML_RIGHT: case TDEHTML_RIGHT:
return Qt::AlignRight; return TQt::AlignRight;
case CENTER: case CENTER:
case TDEHTML_CENTER: case TDEHTML_CENTER:
return Qt::AlignHCenter; return TQt::AlignHCenter;
case JUSTIFY: case JUSTIFY:
// Just fall into the auto code for justify. // Just fall into the auto code for justify.
case TAAUTO: case TAAUTO:
return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft; return style()->direction() == RTL ? TQt::AlignRight : TQt::AlignLeft;
} }
assert(false); // Should never be reached. assert(false); // Should never be reached.
return Qt::AlignLeft; return TQt::AlignLeft;
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------

@ -95,7 +95,7 @@ public:
protected: protected:
virtual bool isRenderButton() const { return false; } virtual bool isRenderButton() const { return false; }
virtual bool isEditable() const { return false; } virtual bool isEditable() const { return false; }
Qt::AlignmentFlags textAlignment() const; TQt::AlignmentFlags textAlignment() const;
TQPoint m_mousePos; TQPoint m_mousePos;
int m_state; int m_state;

@ -66,7 +66,7 @@ RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
m_resizing = m_clientresizing= false; m_resizing = m_clientresizing= false;
m_cursor = Qt::ArrowCursor; m_cursor = TQt::ArrowCursor;
m_hSplit = -1; m_hSplit = -1;
m_vSplit = -1; m_vSplit = -1;
@ -498,13 +498,13 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
} }
m_cursor = Qt::ArrowCursor; m_cursor = TQt::ArrowCursor;
if(m_hSplit != -1 && m_vSplit != -1) if(m_hSplit != -1 && m_vSplit != -1)
m_cursor = Qt::SizeAllCursor; m_cursor = TQt::SizeAllCursor;
else if( m_vSplit != -1 ) else if( m_vSplit != -1 )
m_cursor = Qt::SizeHorCursor; m_cursor = TQt::SizeHorCursor;
else if( m_hSplit != -1 ) else if( m_hSplit != -1 )
m_cursor = Qt::SizeVerCursor; m_cursor = TQt::SizeVerCursor;
if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
{ {
@ -548,8 +548,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
TDEHTMLView *view = canvas()->view(); TDEHTMLView *view = canvas()->view();
if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) { if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
TQPainter paint( view ); TQPainter paint( view );
paint.setPen( Qt::gray ); paint.setPen( TQt::gray );
paint.setBrush( Qt::gray ); paint.setBrush( TQt::gray );
paint.setRasterOp( TQt::XorROP ); paint.setRasterOp( TQt::XorROP );
TQRect r(xPos(), yPos(), width(), height()); TQRect r(xPos(), yPos(), width(), height());
const int rBord = 3; const int rBord = 3;

@ -61,7 +61,7 @@ public:
bool canResize( int _x, int _y); bool canResize( int _x, int _y);
void setResizing(bool e); void setResizing(bool e);
Qt::CursorShape cursorShape() const { return m_cursor; } TQt::CursorShape cursorShape() const { return m_cursor; }
bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside);
@ -73,7 +73,7 @@ public:
#endif #endif
private: private:
Qt::CursorShape m_cursor; TQt::CursorShape m_cursor;
int m_oldpos; int m_oldpos;
int m_gridLen[2]; int m_gridLen[2];
int* m_gridDelta[2]; int* m_gridDelta[2];

@ -358,7 +358,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawEllipse( marker ); p->drawEllipse( marker );
return; return;
case LCIRCLE: case LCIRCLE:
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawEllipse( marker ); p->drawEllipse( marker );
return; return;
case LSQUARE: case LSQUARE:
@ -366,7 +366,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawRect( marker ); p->drawRect( marker );
return; return;
case LBOX: case LBOX:
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawRect( marker ); p->drawRect( marker );
return; return;
case LDIAMOND: { case LDIAMOND: {

@ -243,10 +243,10 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) { if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) {
static TQPixmap *loadingIcon; static TQPixmap *loadingIcon;
TQColor bg = tdehtml::retrieveBackgroundColor(this); TQColor bg = tdehtml::retrieveBackgroundColor(this);
TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray : TQColor fg = tdehtml::hasSufficientContrast(TQt::gray, bg) ? TQt::gray :
(hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black); (hasSufficientContrast(TQt::white, bg) ? TQt::white : TQt::black);
paintInfo.p->setPen(TQPen(fg, 1)); paintInfo.p->setPen(TQPen(fg, 1));
paintInfo.p->setBrush( Qt::NoBrush ); paintInfo.p->setBrush( TQt::NoBrush );
paintInfo.p->drawRect(_tx, _ty, m_width, m_height); paintInfo.p->drawRect(_tx, _ty, m_width, m_height);
if (!(m_width <= 5 || m_height <= 5)) { if (!(m_width <= 5 || m_height <= 5)) {
if (!loadingIcon) { if (!loadingIcon) {
@ -289,7 +289,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
} }
else if (i && !i->isTransparent()) else if (i && !i->isTransparent())
{ {
paintInfo.p->setPen( Qt::black ); // used for bitmaps paintInfo.p->setPen( TQt::black ); // used for bitmaps
const TQPixmap& pix = i->pixmap(); const TQPixmap& pix = i->pixmap();
if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) && if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid()) pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
@ -371,7 +371,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y()); paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y());
paintInfo.p->fillRect(_tx, _ty, width(), height(), paintInfo.p->fillRect(_tx, _ty, width(), height(),
TQBrush(style()->palette().active().highlight(), TQBrush(style()->palette().active().highlight(),
Qt::Dense4Pattern)); TQt::Dense4Pattern));
} }
} }
} }

@ -678,7 +678,7 @@ static void paintOutlineSegment(RenderObject *o, TQPainter *p, int tx, int ty,
} }
// kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl; // kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl;
/* p->setPen(Qt::gray); /* p->setPen(TQt::gray);
p->drawLine(x1,y1,x2,y2);*/ p->drawLine(x1,y1,x2,y2);*/
switch (curBS) { switch (curBS) {
case RenderObject::BSLeft: case RenderObject::BSLeft:

@ -604,9 +604,9 @@ void RenderLayer::updateScrollPositionFromScrollbars()
} }
void void
RenderLayer::showScrollbar(Qt::Orientation o, bool show) RenderLayer::showScrollbar(TQt::Orientation o, bool show)
{ {
TQScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar; TQScrollBar *sb = (o == TQt::Horizontal) ? m_hBar : m_vBar;
if (show && !sb) { if (show && !sb) {
TQScrollView* scrollView = m_object->document()->view(); TQScrollView* scrollView = m_object->document()->view();
@ -623,7 +623,7 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
sb = 0; sb = 0;
} }
if (o == Qt::Horizontal) if (o == TQt::Horizontal)
m_hBar = sb; m_hBar = sb;
else else
m_vBar = sb; m_vBar = sb;
@ -749,12 +749,12 @@ void RenderLayer::checkScrollbarsAfterLayout()
|| (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar); || (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar);
if (scrollbarsChanged) { if (scrollbarsChanged) {
if (m_object->style()->overflowX() == OAUTO) { if (m_object->style()->overflowX() == OAUTO) {
showScrollbar(Qt::Horizontal, needHorizontalBar); showScrollbar(TQt::Horizontal, needHorizontalBar);
if (m_hBar) if (m_hBar)
m_hBar->setEnabled(true); m_hBar->setEnabled(true);
} }
if (m_object->style()->overflowY() == OAUTO) { if (m_object->style()->overflowY() == OAUTO) {
showScrollbar(Qt::Vertical, needVerticalBar); showScrollbar(TQt::Vertical, needVerticalBar);
if (m_vBar) if (m_vBar)
m_vBar->setEnabled(true); m_vBar->setEnabled(true);
} }
@ -956,8 +956,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
int ax=0; int ax=0;
int ay=0; int ay=0;
renderer()->absolutePosition( ax, ay ); renderer()->absolutePosition( ax, ay );
p->setPen(TQPen(TQColor("yellow"), 1, Qt::DotLine)); p->setPen(TQPen(TQColor("yellow"), 1, TQt::DotLine));
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawRect(ax, ay, width(), height()); p->drawRect(ax, ay, width(), height());
} }
#endif #endif

@ -193,7 +193,7 @@ public:
void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
void showScrollbar(Qt::Orientation, bool); void showScrollbar(TQt::Orientation, bool);
TQScrollBar* horizontalScrollbar() { return m_hBar; } TQScrollBar* horizontalScrollbar() { return m_hBar; }
TQScrollBar* verticalScrollbar() { return m_vBar; } TQScrollBar* verticalScrollbar() { return m_vBar; }
int verticalScrollbarWidth(); int verticalScrollbarWidth();

@ -299,7 +299,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
} }
#ifdef BOX_DEBUG #ifdef BOX_DEBUG
p->setPen( Qt::red ); p->setPen( TQt::red );
p->drawRect( _tx + xoff, _ty + yoff, offset, offset ); p->drawRect( _tx + xoff, _ty + yoff, offset, offset );
#endif #endif
@ -312,7 +312,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return; return;
case LCIRCLE: case LCIRCLE:
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return; return;
case LSQUARE: case LSQUARE:
@ -320,7 +320,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return; return;
case LBOX: case LBOX:
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return; return;
case LDIAMOND: { case LDIAMOND: {
@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (!m_item.isEmpty()) { if (!m_item.isEmpty()) {
if(listPositionInside()) { if(listPositionInside()) {
if( style()->direction() == LTR) { if( style()->direction() == LTR) {
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, p->drawText(_tx + fm.width(m_item), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip,
TQString::fromLatin1(". ")); TQString::fromLatin1(". "));
} }
else { else {
const TQString& punct(TQString::fromLatin1(" .")); const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); p->drawText(_tx + fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
} }
} else { } else {
if (style()->direction() == LTR) { if (style()->direction() == LTR) {
const TQString& punct(TQString::fromLatin1(". ")); const TQString& punct(TQString::fromLatin1(". "));
p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct); p->drawText(_tx-offset/2, _ty, 0, 0, TQt::AlignRight|TQt::DontClip, punct);
p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, TQt::AlignRight|TQt::DontClip, m_item);
} }
else { else {
const TQString& punct(TQString::fromLatin1(" .")); const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); p->drawText(_tx+offset/2, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
} }
} }
} }

@ -722,7 +722,7 @@ static void calc3DColor(TQColor &color, bool darken)
int g = gb - (f0 * gb / 100); int g = gb - (f0 * gb / 100);
int b = bb - (f0 * bb / 100); int b = bb - (f0 * bb / 100);
if ((r == rb) && (g == gb) && (b == bb)) if ((r == rb) && (g == gb) && (b == bb))
color = (color == Qt::black) ? DARK_GRAY : Qt::black; color = (color == TQt::black) ? DARK_GRAY : TQt::black;
else else
color.setRgb(r, g, b); color.setRgb(r, g, b);
} else { } else {
@ -730,7 +730,7 @@ static void calc3DColor(TQColor &color, bool darken)
int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255); int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255);
int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255); int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255);
if ((r == rb) && (g == gb) && (b == bb)) if ((r == rb) && (g == gb) && (b == bb))
color = (color == Qt::white) ? LIGHT_GRAY : Qt::white; color = (color == TQt::white) ? LIGHT_GRAY : TQt::white;
else else
color.setRgb(r, g, b); color.setRgb(r, g, b);
} }
@ -749,12 +749,12 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
if(invalidisInvert) if(invalidisInvert)
{ {
p->setRasterOp(TQt::XorROP); p->setRasterOp(TQt::XorROP);
c = Qt::white; c = TQt::white;
} }
else { else {
if(style == INSET || style == OUTSET || style == RIDGE || style == if(style == INSET || style == OUTSET || style == RIDGE || style ==
GROOVE) GROOVE)
c = Qt::white; c = TQt::white;
else else
c = textcolor; c = textcolor;
} }
@ -773,7 +773,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
case DOTTED: case DOTTED:
if ( width == 1 ) { if ( width == 1 ) {
// workaround Qt brokenness // workaround Qt brokenness
p->setPen(TQPen(c, width, Qt::SolidLine)); p->setPen(TQPen(c, width, TQt::SolidLine));
switch(s) { switch(s) {
case BSBottom: case BSBottom:
case BSTop: case BSTop:
@ -788,11 +788,11 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
break; break;
} }
p->setPen(TQPen(c, width, Qt::DotLine)); p->setPen(TQPen(c, width, TQt::DotLine));
/* nobreak; */ /* nobreak; */
case DASHED: case DASHED:
if(style == DASHED) if(style == DASHED)
p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? Qt::DotLine : Qt::DashLine)); p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? TQt::DotLine : TQt::DashLine));
if (width > 0) if (width > 0)
switch(s) { switch(s) {
@ -813,7 +813,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
if (adjbw1 == 0 && adjbw2 == 0) if (adjbw1 == 0 && adjbw2 == 0)
{ {
p->setPen(Qt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(c); p->setBrush(c);
switch(s) switch(s)
{ {
@ -921,7 +921,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
(style == INSET && ( s == BSTop || s == BSLeft ) ) ); (style == INSET && ( s == BSTop || s == BSLeft ) ) );
/* nobreak; */ /* nobreak; */
case SOLID: case SOLID:
p->setPen(Qt::NoPen); p->setPen(TQt::NoPen);
p->setBrush(c); p->setBrush(c);
Q_ASSERT(x2>=x1); Q_ASSERT(x2>=x1);
Q_ASSERT(y2>=y1); Q_ASSERT(y2>=y1);

@ -316,12 +316,12 @@ void RenderWidget::updateFromElement()
if (v > 128) if (v > 128)
// dark bg, light fg - need a darker disabled fg // dark bg, light fg - need a darker disabled fg
disfg = disfg.dark(lowlightVal); disfg = disfg.dark(lowlightVal);
else if (disfg != Qt::black) else if (disfg != TQt::black)
// light bg, dark fg - need a lighter disabled fg - but only if !black // light bg, dark fg - need a lighter disabled fg - but only if !black
disfg = disfg.light(highlightVal); disfg = disfg.light(highlightVal);
else else
// black fg - use darkgray disabled fg // black fg - use darkgray disabled fg
disfg = Qt::darkGray; disfg = TQt::darkGray;
pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg); pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg);
} }
@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
} }
switch (me.button()) { switch (me.button()) {
case 0: case 0:
button = Qt::LeftButton; button = TQt::LeftButton;
break; break;
case 1: case 1:
button = Qt::MidButton; button = TQt::MidButton;
break; break;
case 2: case 2:
button = Qt::RightButton; button = TQt::RightButton;
break; break;
default: default:
break; break;
@ -847,7 +847,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
// DOM: Down Press | Press | Up // DOM: Down Press | Press | Up
// Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release // Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release
// //
// Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow
// sites to block a key with onkeypress, #99749 // sites to block a key with onkeypress, #99749
TQKeyEvent* const ke = domKeyEv.qKeyEvent(); TQKeyEvent* const ke = domKeyEv.qKeyEvent();

@ -1450,7 +1450,7 @@ public:
static short initialBorderHorizontalSpacing() { return 0; } static short initialBorderHorizontalSpacing() { return 0; }
static short initialBorderVerticalSpacing() { return 0; } static short initialBorderVerticalSpacing() { return 0; }
static ECursor initialCursor() { return CURSOR_AUTO; } static ECursor initialCursor() { return CURSOR_AUTO; }
static TQColor initialColor() { return Qt::black; } static TQColor initialColor() { return TQt::black; }
static CachedImage* initialBackgroundImage() { return 0; } static CachedImage* initialBackgroundImage() { return 0; }
static CachedImage* initialListStyleImage() { return 0; } static CachedImage* initialListStyleImage() { return 0; }
static unsigned short initialBorderWidth() { return 3; } static unsigned short initialBorderWidth() { return 3; }

@ -2699,8 +2699,8 @@ int RenderTableCell::borderBottom() const
static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h) static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h)
{ {
p->setPen(TQPen(TQColor("yellow"), 3, Qt::DotLine)); p->setPen(TQPen(TQColor("yellow"), 3, TQt::DotLine));
p->setBrush( Qt::NoBrush ); p->setBrush( TQt::NoBrush );
p->drawRect(_tx, _ty, w, h ); p->drawRect(_tx, _ty, w, h );
} }
#endif #endif

@ -398,7 +398,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
} }
} }
pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::PreferDither); pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::PreferDither);
} }
// Paint next shadow effect // Paint next shadow effect
if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next); if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next);

@ -150,7 +150,7 @@ void TDEHTMLPartIface::activateNode()
{ {
KParts::ReadOnlyPart* p = part->currentFrame(); KParts::ReadOnlyPart* p = part->currentFrame();
if ( p && p->widget() ) { if ( p && p->widget() ) {
TQKeyEvent ev( TQKeyEvent::KeyPress, Qt::Key_Return, '\n', 0, "\n" ); TQKeyEvent ev( TQKeyEvent::KeyPress, TQt::Key_Return, '\n', 0, "\n" );
TQApplication::sendEvent( p->widget(), &ev ); TQApplication::sendEvent( p->widget(), &ev );
} }
} }

@ -3933,7 +3933,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
return true; return true;
} }
if ( button == Qt::LeftButton && ( state & ShiftButton ) ) if ( button == TQt::LeftButton && ( state & ShiftButton ) )
{ {
TDEIO::MetaData metaData; TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer; metaData["referrer"] = d->m_referrer;
@ -3972,7 +3972,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
args.metaData()["referrer"] = d->m_referrer; args.metaData()["referrer"] = d->m_referrer;
if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) ) if ( button == TQt::NoButton && (state & ShiftButton) && (state & ControlButton) )
{ {
emit d->m_extension->createNewWindow( cURL, args ); emit d->m_extension->createNewWindow( cURL, args );
return true; return true;
@ -5839,7 +5839,7 @@ TQString TDEHTMLPart::lastModified() const
// Done on demand to save time when this isn't needed - but can lead // Done on demand to save time when this isn't needed - but can lead
// to slightly wrong results if updating the file on disk w/o reloading. // to slightly wrong results if updating the file on disk w/o reloading.
TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified(); TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified();
d->m_lastModified = lastModif.toString( Qt::LocalDate ); d->m_lastModified = lastModif.toString( TQt::LocalDate );
} }
//kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl; //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl;
return d->m_lastModified; return d->m_lastModified;
@ -6062,13 +6062,13 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
else else
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString(); d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
if ( _mouse->button() == Qt::LeftButton || if ( _mouse->button() == TQt::LeftButton ||
_mouse->button() == Qt::MidButton ) _mouse->button() == TQt::MidButton )
{ {
d->m_bMousePressed = true; d->m_bMousePressed = true;
#ifndef TDEHTML_NO_SELECTION #ifndef TDEHTML_NO_SELECTION
if ( _mouse->button() == Qt::LeftButton ) if ( _mouse->button() == TQt::LeftButton )
{ {
if ( (!d->m_strSelectedURL.isNull() && !isEditable()) if ( (!d->m_strSelectedURL.isNull() && !isEditable())
|| (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) )
@ -6116,10 +6116,10 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
#endif #endif
} }
if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{ {
d->m_bRightMousePressed = true; d->m_bRightMousePressed = true;
} else if ( _mouse->button() == Qt::RightButton ) } else if ( _mouse->button() == TQt::RightButton )
{ {
popupMenu( d->m_strSelectedURL ); popupMenu( d->m_strSelectedURL );
// might be deleted, don't touch "this" // might be deleted, don't touch "this"
@ -6129,7 +6129,7 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event ) void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event )
{ {
TQMouseEvent *_mouse = event->qmouseEvent(); TQMouseEvent *_mouse = event->qmouseEvent();
if ( _mouse->button() == Qt::LeftButton ) if ( _mouse->button() == TQt::LeftButton )
{ {
d->m_bMousePressed = true; d->m_bMousePressed = true;
DOM::Node innerNode = event->innerNode(); DOM::Node innerNode = event->innerNode();
@ -6498,7 +6498,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
#ifndef TDEHTML_NO_SELECTION #ifndef TDEHTML_NO_SELECTION
// selection stuff // selection stuff
if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() && if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() &&
( (_mouse->state() & Qt::LeftButton) != 0 )) { ( (_mouse->state() & TQt::LeftButton) != 0 )) {
extendSelectionTo(event->x(), event->y(), extendSelectionTo(event->x(), event->y(),
event->absX(), event->absY(), innerNode); event->absX(), event->absY(), innerNode);
#else #else
@ -6530,7 +6530,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
d->m_bMousePressed = false; d->m_bMousePressed = false;
TQMouseEvent *_mouse = event->qmouseEvent(); TQMouseEvent *_mouse = event->qmouseEvent();
if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{ {
d->m_bRightMousePressed = false; d->m_bRightMousePressed = false;
KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface(); KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface();
@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
} }
} }
#ifndef TQT_NO_CLIPBOARD #ifndef TQT_NO_CLIPBOARD
if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) { if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == TQt::MidButton) && (event->url().isNull())) {
kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
<< d->m_bOpenMiddleClick << endl; << d->m_bOpenMiddleClick << endl;

@ -941,7 +941,7 @@ void TDEHTMLView::closeEvent( TQCloseEvent* ev )
void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
{ {
if (!m_part->xmlDocImpl()) return; if (!m_part->xmlDocImpl()) return;
if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton) if (d->possibleTripleClick && ( _mouse->button() & TQt::MouseButtonMask ) == TQt::LeftButton)
{ {
viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too
return; return;
@ -958,7 +958,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
//kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl; //kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl;
if ( (_mouse->button() == Qt::MidButton) && if ( (_mouse->button() == TQt::MidButton) &&
!m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer && !m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer &&
mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) { mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) {
TQPoint point = mapFromGlobal( _mouse->globalPos() ); TQPoint point = mapFromGlobal( _mouse->globalPos() );
@ -1168,7 +1168,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove ); DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove );
// Do not modify :hover/:active state while mouse is pressed. // Do not modify :hover/:active state while mouse is pressed.
m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & Qt::MouseButtonMask /*readonly ?*/, xm, ym, &mev ); m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & TQt::MouseButtonMask /*readonly ?*/, xm, ym, &mev );
// kdDebug(6000) << "mouse move: " << _mouse->pos() // kdDebug(6000) << "mouse move: " << _mouse->pos()
// << " button " << _mouse->button() // << " button " << _mouse->button()
@ -1341,7 +1341,7 @@ void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode(); DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
if (fn && fn != mev.innerNode.handle() && if (fn && fn != mev.innerNode.handle() &&
fn->renderer() && fn->renderer()->isWidget() && fn->renderer() && fn->renderer()->isWidget() &&
_mouse->button() != Qt::MidButton) { _mouse->button() != TQt::MidButton) {
forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym); forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
} }
@ -2884,15 +2884,15 @@ void TDEHTMLView::print(bool quick)
if (printHeader) if (printHeader)
{ {
int available_width = metrics.width() - 10 - int available_width = metrics.width() - 10 -
2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerLeft).width(), 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerLeft).width(),
p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerRight).width()); p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerRight).width());
if (available_width < 150) if (available_width < 150)
available_width = 150; available_width = 150;
int mid_width; int mid_width;
int squeeze = 120; int squeeze = 120;
do { do {
headerMid = KStringHandler::csqueeze(docname, squeeze); headerMid = KStringHandler::csqueeze(docname, squeeze);
mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerMid).width(); mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerMid).width();
squeeze -= 10; squeeze -= 10;
} while (mid_width > available_width); } while (mid_width > available_width);
} }
@ -2906,14 +2906,14 @@ void TDEHTMLView::print(bool quick)
if (printHeader) if (printHeader)
{ {
int dy = p->fontMetrics().lineSpacing(); int dy = p->fontMetrics().lineSpacing();
p->setPen(Qt::black); p->setPen(TQt::black);
p->setFont(headerFont); p->setFont(headerFont);
headerRight = TQString("#%1").arg(page); headerRight = TQString("#%1").arg(page);
p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft); p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft);
p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid); p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid);
p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight); p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight);
} }
@ -3156,13 +3156,13 @@ bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
int screenY = _mouse->globalY(); int screenY = _mouse->globalY();
int button = -1; int button = -1;
switch (_mouse->button()) { switch (_mouse->button()) {
case Qt::LeftButton: case TQt::LeftButton:
button = 0; button = 0;
break; break;
case Qt::MidButton: case TQt::MidButton:
button = 1; button = 1;
break; break;
case Qt::RightButton: case TQt::RightButton:
button = 2; button = 2;
break; break;
default: default:
@ -3278,12 +3278,12 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
{ {
e->accept(); e->accept();
} }
else if( ( (e->orientation() == Qt::Vertical && else if( ( (e->orientation() == TQt::Vertical &&
((d->ignoreWheelEvents && !verticalScrollBar()->isVisible()) ((d->ignoreWheelEvents && !verticalScrollBar()->isVisible())
|| e->delta() > 0 && contentsY() <= 0 || e->delta() > 0 && contentsY() <= 0
|| e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight())) || e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight()))
|| ||
(e->orientation() == Qt::Horizontal && (e->orientation() == TQt::Horizontal &&
((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible()) ((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible())
|| e->delta() > 0 && contentsX() <=0 || e->delta() > 0 && contentsX() <=0
|| e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth()))) || e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth())))
@ -3302,7 +3302,7 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
TQScrollView::viewportWheelEvent( e ); TQScrollView::viewportWheelEvent( e );
#endif #endif
TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), Qt::NoButton, e->state() ); TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), TQt::NoButton, e->state() );
emit viewportMouseMoveEvent ( tempEvent ); emit viewportMouseMoveEvent ( tempEvent );
delete tempEvent; delete tempEvent;
} }
@ -4604,9 +4604,9 @@ void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) )
step = pageStep; step = pageStep;
if(e->orientation() == Qt::Horizontal) if(e->orientation() == TQt::Horizontal)
scrollBy(-((e->delta()*step)/120), 0); scrollBy(-((e->delta()*step)/120), 0);
else if(e->orientation() == Qt::Vertical) else if(e->orientation() == TQt::Vertical)
scrollBy(0,-((e->delta()*step)/120)); scrollBy(0,-((e->delta()*step)/120));
e->accept(); e->accept();

@ -965,7 +965,7 @@ TQImage RegressionTest::renderToImage()
TQPainter* tp = new TQPainter; TQPainter* tp = new TQPainter;
tp->begin( m_paintBuffer ); tp->begin( m_paintBuffer );
tp->translate( -px, -py ); tp->translate( -px, -py );
tp->fillRect(px, py, 512, 128, Qt::magenta); tp->fillRect(px, py, 512, 128, TQt::magenta);
m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) ); m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) );
tp->end(); tp->end();
delete tp; delete tp;

@ -105,7 +105,7 @@ int main(int argc, char *argv[])
e.setAttribute( "name", "print" ); e.setAttribute( "name", "print" );
toolBar.insertBefore( e, toolBar.firstChild() ); toolBar.insertBefore( e, toolBar.firstChild() );
(void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" ); (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
(void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
kprint->setEnabled(true); kprint->setEnabled(true);
@ -120,7 +120,7 @@ int main(int argc, char *argv[])
doc->setJScriptEnabled(true); doc->setJScriptEnabled(true);
doc->setJavaEnabled(true); doc->setJavaEnabled(true);
doc->setPluginsEnabled( true ); doc->setPluginsEnabled( true );
doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); doc->setURLCursor(TQCursor(TQt::PointingHandCursor));
a.setTopWidget(doc->widget()); a.setTopWidget(doc->widget());
TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)),
doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));

@ -526,52 +526,52 @@ private:
/* Mapping between special Qt keycodes and virtual DOM codes */ /* Mapping between special Qt keycodes and virtual DOM codes */
IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] = IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
{ {
{KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace}, {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace},
{KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter}, {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter},
{KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return}, {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return},
{KeyEventBaseImpl::DOM_VK_NUM_LOCK, Qt::Key_NumLock}, {KeyEventBaseImpl::DOM_VK_NUM_LOCK, TQt::Key_NumLock},
{KeyEventBaseImpl::DOM_VK_RIGHT_ALT, Qt::Key_Alt}, {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, TQt::Key_Alt},
{KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control}, {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control},
{KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, Qt::Key_Shift}, {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, TQt::Key_Shift},
{KeyEventBaseImpl::DOM_VK_META, Qt::Key_Meta}, {KeyEventBaseImpl::DOM_VK_META, TQt::Key_Meta},
{KeyEventBaseImpl::DOM_VK_CAPS_LOCK, Qt::Key_CapsLock}, {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, TQt::Key_CapsLock},
{KeyEventBaseImpl::DOM_VK_DELETE, Qt::Key_Delete}, {KeyEventBaseImpl::DOM_VK_DELETE, TQt::Key_Delete},
{KeyEventBaseImpl::DOM_VK_END, Qt::Key_End}, {KeyEventBaseImpl::DOM_VK_END, TQt::Key_End},
{KeyEventBaseImpl::DOM_VK_ESCAPE, Qt::Key_Escape}, {KeyEventBaseImpl::DOM_VK_ESCAPE, TQt::Key_Escape},
{KeyEventBaseImpl::DOM_VK_HOME, Qt::Key_Home}, {KeyEventBaseImpl::DOM_VK_HOME, TQt::Key_Home},
{KeyEventBaseImpl::DOM_VK_PAUSE, Qt::Key_Pause}, {KeyEventBaseImpl::DOM_VK_PAUSE, TQt::Key_Pause},
{KeyEventBaseImpl::DOM_VK_PRINTSCREEN, Qt::Key_Print}, {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, TQt::Key_Print},
{KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, Qt::Key_ScrollLock}, {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, TQt::Key_ScrollLock},
{KeyEventBaseImpl::DOM_VK_LEFT, Qt::Key_Left}, {KeyEventBaseImpl::DOM_VK_LEFT, TQt::Key_Left},
{KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right}, {KeyEventBaseImpl::DOM_VK_RIGHT, TQt::Key_Right},
{KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up}, {KeyEventBaseImpl::DOM_VK_UP, TQt::Key_Up},
{KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down}, {KeyEventBaseImpl::DOM_VK_DOWN, TQt::Key_Down},
{KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next}, {KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next},
{KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior}, {KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior},
{KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1}, {KeyEventBaseImpl::DOM_VK_F1, TQt::Key_F1},
{KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2}, {KeyEventBaseImpl::DOM_VK_F2, TQt::Key_F2},
{KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3}, {KeyEventBaseImpl::DOM_VK_F3, TQt::Key_F3},
{KeyEventBaseImpl::DOM_VK_F4, Qt::Key_F4}, {KeyEventBaseImpl::DOM_VK_F4, TQt::Key_F4},
{KeyEventBaseImpl::DOM_VK_F5, Qt::Key_F5}, {KeyEventBaseImpl::DOM_VK_F5, TQt::Key_F5},
{KeyEventBaseImpl::DOM_VK_F6, Qt::Key_F6}, {KeyEventBaseImpl::DOM_VK_F6, TQt::Key_F6},
{KeyEventBaseImpl::DOM_VK_F7, Qt::Key_F7}, {KeyEventBaseImpl::DOM_VK_F7, TQt::Key_F7},
{KeyEventBaseImpl::DOM_VK_F8, Qt::Key_F8}, {KeyEventBaseImpl::DOM_VK_F8, TQt::Key_F8},
{KeyEventBaseImpl::DOM_VK_F9, Qt::Key_F9}, {KeyEventBaseImpl::DOM_VK_F9, TQt::Key_F9},
{KeyEventBaseImpl::DOM_VK_F10, Qt::Key_F10}, {KeyEventBaseImpl::DOM_VK_F10, TQt::Key_F10},
{KeyEventBaseImpl::DOM_VK_F11, Qt::Key_F11}, {KeyEventBaseImpl::DOM_VK_F11, TQt::Key_F11},
{KeyEventBaseImpl::DOM_VK_F12, Qt::Key_F12}, {KeyEventBaseImpl::DOM_VK_F12, TQt::Key_F12},
{KeyEventBaseImpl::DOM_VK_F13, Qt::Key_F13}, {KeyEventBaseImpl::DOM_VK_F13, TQt::Key_F13},
{KeyEventBaseImpl::DOM_VK_F14, Qt::Key_F14}, {KeyEventBaseImpl::DOM_VK_F14, TQt::Key_F14},
{KeyEventBaseImpl::DOM_VK_F15, Qt::Key_F15}, {KeyEventBaseImpl::DOM_VK_F15, TQt::Key_F15},
{KeyEventBaseImpl::DOM_VK_F16, Qt::Key_F16}, {KeyEventBaseImpl::DOM_VK_F16, TQt::Key_F16},
{KeyEventBaseImpl::DOM_VK_F17, Qt::Key_F17}, {KeyEventBaseImpl::DOM_VK_F17, TQt::Key_F17},
{KeyEventBaseImpl::DOM_VK_F18, Qt::Key_F18}, {KeyEventBaseImpl::DOM_VK_F18, TQt::Key_F18},
{KeyEventBaseImpl::DOM_VK_F19, Qt::Key_F19}, {KeyEventBaseImpl::DOM_VK_F19, TQt::Key_F19},
{KeyEventBaseImpl::DOM_VK_F20, Qt::Key_F20}, {KeyEventBaseImpl::DOM_VK_F20, TQt::Key_F20},
{KeyEventBaseImpl::DOM_VK_F21, Qt::Key_F21}, {KeyEventBaseImpl::DOM_VK_F21, TQt::Key_F21},
{KeyEventBaseImpl::DOM_VK_F22, Qt::Key_F22}, {KeyEventBaseImpl::DOM_VK_F22, TQt::Key_F22},
{KeyEventBaseImpl::DOM_VK_F23, Qt::Key_F23}, {KeyEventBaseImpl::DOM_VK_F23, TQt::Key_F23},
{KeyEventBaseImpl::DOM_VK_F24, Qt::Key_F24}, {KeyEventBaseImpl::DOM_VK_F24, TQt::Key_F24},
{0, 0} {0, 0}
}; };
@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const
} }
//Neuter F keys as well. //Neuter F keys as well.
if (key >= Qt::Key_F1 && key <= Qt::Key_F35) if (key >= TQt::Key_F1 && key <= TQt::Key_F35)
key = Qt::Key_ScrollLock; key = TQt::Key_ScrollLock;
m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress, m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress,
key, ascii, modifiers, text); key, ascii, modifiers, text);

@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
m_paintDeviceMetrics = 0; m_paintDeviceMetrics = 0;
m_paintDevice = 0; m_paintDevice = 0;
m_decoderMibEnum = 0; m_decoderMibEnum = 0;
m_textColor = Qt::black; m_textColor = TQt::black;
m_view = v; m_view = v;
m_renderArena.reset(); m_renderArena.reset();

@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
int button = -1; int button = -1;
switch (_mouse->button()) { switch (_mouse->button()) {
case Qt::LeftButton: case TQt::LeftButton:
button = 0; button = 0;
break; break;
case Qt::MidButton: case TQt::MidButton:
button = 1; button = 1;
break; break;
case Qt::RightButton: case TQt::RightButton:
button = 2; button = 2;
break; break;
default: default:

@ -265,7 +265,7 @@ void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/,
void KBookmarkBar::slotBookmarkSelected() void KBookmarkBar::slotBookmarkSelected()
{ {
slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton); slotBookmarkSelected(TDEAction::ToolBarActivation, TQt::NoButton);
} }
static const int const_sepId = -9999; // FIXME this is ugly, static const int const_sepId = -9999; // FIXME this is ugly,
@ -456,7 +456,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
// FIXME, see how this holds up on an empty toolbar // FIXME, see how this holds up on an empty toolbar
_a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt ); _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt );
if (_a && mev->button() == Qt::RightButton) if (_a && mev->button() == TQt::RightButton)
{ {
dptr()->m_highlightedAddress = _a->property("address").toString(); dptr()->m_highlightedAddress = _a->property("address").toString();
KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress ); KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );

@ -756,7 +756,7 @@ void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/
void KBookmarkMenu::slotBookmarkSelected() void KBookmarkMenu::slotBookmarkSelected()
{ {
slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton); slotBookmarkSelected(TDEAction::PopupMenuActivation, TQt::NoButton);
} }
KExtendedBookmarkOwner* KBookmarkMenu::extOwner() KExtendedBookmarkOwner* KBookmarkMenu::extOwner()

@ -285,14 +285,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
d->_serialNum->setText(x->getSerialNumber()); d->_serialNum->setText(x->getSerialNumber());
cspl = d->_validFrom->palette(); cspl = d->_validFrom->palette();
if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC)) if (x->getQDTNotBefore() > TQDateTime::currentDateTime(TQt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validFrom->setPalette(cspl); d->_validFrom->setPalette(cspl);
d->_validFrom->setText(x->getNotBefore()); d->_validFrom->setText(x->getNotBefore());
cspl = d->_validUntil->palette(); cspl = d->_validUntil->palette();
if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC)) if (x->getQDTNotAfter() < TQDateTime::currentDateTime(TQt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validUntil->setPalette(cspl); d->_validUntil->setPalette(cspl);
@ -317,8 +317,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
ksv = ksvl.first(); ksv = ksvl.first();
if (ksv == KSSLCertificate::SelfSigned) { if (ksv == KSSLCertificate::SelfSigned) {
if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && if (x->getQDTNotAfter() > TQDateTime::currentDateTime(TQt::UTC) &&
x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) { x->getQDTNotBefore() < TQDateTime::currentDateTime(TQt::UTC)) {
if (KSSLSigners().useForSSL(*x)) if (KSSLSigners().useForSSL(*x))
ksv = KSSLCertificate::Ok; ksv = KSSLCertificate::Ok;
} else { } else {
@ -411,37 +411,37 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) {
TQLabel *label = 0L; TQLabel *label = 0L;
if (!(tmp = cert.getValue("O")).isEmpty()) { if (!(tmp = cert.getValue("O")).isEmpty()) {
label = new TQLabel(i18n("Organization:"), _frame); label = new TQLabel(i18n("Organization:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("OU")).isEmpty()) { if (!(tmp = cert.getValue("OU")).isEmpty()) {
label = new TQLabel(i18n("Organizational unit:"), _frame); label = new TQLabel(i18n("Organizational unit:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("L")).isEmpty()) { if (!(tmp = cert.getValue("L")).isEmpty()) {
label = new TQLabel(i18n("Locality:"), _frame); label = new TQLabel(i18n("Locality:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("ST")).isEmpty()) { if (!(tmp = cert.getValue("ST")).isEmpty()) {
label = new TQLabel(i18n("Federal State","State:"), _frame); label = new TQLabel(i18n("Federal State","State:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("C")).isEmpty()) { if (!(tmp = cert.getValue("C")).isEmpty()) {
label = new TQLabel(i18n("Country:"), _frame); label = new TQLabel(i18n("Country:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("CN")).isEmpty()) { if (!(tmp = cert.getValue("CN")).isEmpty()) {
label = new TQLabel(i18n("Common name:"), _frame); label = new TQLabel(i18n("Common name:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
(new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
} }
if (!(tmp = cert.getValue("Email")).isEmpty()) { if (!(tmp = cert.getValue("Email")).isEmpty()) {
label = new TQLabel(i18n("Email:"), _frame); label = new TQLabel(i18n("Email:"), _frame);
label->setAlignment(Qt::AlignLeft | Qt::AlignTop); label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
if (mailCatcher) { if (mailCatcher) {
KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); KURLLabel *mail = new KURLLabel(tmp, tmp, _frame);
connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &)));

@ -213,7 +213,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
const bool lastNonDefault = !isDefault && below && below->isDefault; const bool lastNonDefault = !isDefault && below && below->isDefault;
if ( type == KACLListView::Mask || lastUser || lastNonDefault ) if ( type == KACLListView::Mask || lastUser || lastNonDefault )
{ {
p->setPen( TQPen( Qt::gray, 0, TQPen::DotLine ) ); p->setPen( TQPen( TQt::gray, 0, TQPen::DotLine ) );
if ( type == KACLListView::Mask ) if ( type == KACLListView::Mask )
p->drawLine( 0, 0, width - 1, 0 ); p->drawLine( 0, 0, width - 1, 0 );
p->drawLine( 0, height() - 1, width - 1, height() - 1 ); p->drawLine( 0, height() - 1, width - 1, height() - 1 );

@ -94,7 +94,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
m_listView->addColumn(i18n("Menu")); m_listView->addColumn(i18n("Menu"));
m_listView->setFullWidth(true); m_listView->setFullWidth(true);
m_listView->setSorting(-1); m_listView->setSorting(-1);
KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical); KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical);
buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem()));
d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()));
d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp()));

@ -267,7 +267,7 @@ void TDEIconDialog::init()
TQVBoxLayout *top = new TQVBoxLayout(main); TQVBoxLayout *top = new TQVBoxLayout(main);
top->setSpacing( spacingHint() ); top->setSpacing( spacingHint() );
TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); TQButtonGroup *bgroup = new TQButtonGroup(0, TQt::Vertical, i18n("Icon Source"), main);
bgroup->layout()->setSpacing(KDialog::spacingHint()); bgroup->layout()->setSpacing(KDialog::spacingHint());
bgroup->layout()->setMargin(KDialog::marginHint()); bgroup->layout()->setMargin(KDialog::marginHint());
top->addWidget(bgroup); top->addWidget(bgroup);

@ -43,7 +43,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
imageLabel = new TQLabel( this ); imageLabel = new TQLabel( this );
imageLabel->setFrameStyle( TQFrame::NoFrame ); imageLabel->setFrameStyle( TQFrame::NoFrame );
imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
vb->addWidget( imageLabel ); vb->addWidget( imageLabel );

@ -150,7 +150,7 @@ void KFileMetaPropsPlugin::createLayout()
if (itemList.isEmpty()) if (itemList.isEmpty())
continue; continue;
TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal,
TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()),
d->m_frame); d->m_frame);

@ -133,7 +133,7 @@ namespace KNotify
TQHeader *header = static_cast<TQHeader*>( parentWidget() ); TQHeader *header = static_cast<TQHeader*>( parentWidget() );
int section = 0; int section = 0;
if ( header->orientation() == Qt::Horizontal ) if ( header->orientation() == TQt::Horizontal )
section= header->sectionAt( p.x() ); section= header->sectionAt( p.x() );
else else
section= header->sectionAt( p.y() ); section= header->sectionAt( p.y() );

@ -906,7 +906,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
} }
iconArea = iconLabel; iconArea = iconLabel;
} }
grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); grid->addWidget(iconArea, curRow, 0, TQt::AlignLeft);
if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot) if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot)
{ {
@ -1676,7 +1676,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
TQPushButton* pbAdvancedPerm = 0; TQPushButton* pbAdvancedPerm = 0;
/* Group: Access Permissions */ /* Group: Access Permissions */
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), d->m_frame );
gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint()); gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb); box->addWidget (gb);
@ -1737,7 +1737,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
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);
gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight); gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight);
connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() ));
} }
else else
@ -1745,7 +1745,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
/**** Group: Ownership ****/ /**** Group: Ownership ****/
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Ownership"), d->m_frame );
gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint()); gb->layout()->setMargin(KDialog::marginHint());
box->addWidget (gb); box->addWidget (gb);
@ -1941,7 +1941,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
TQVBox *mainVBox = dlg.makeVBoxMainWidget(); TQVBox *mainVBox = dlg.makeVBoxMainWidget();
// Group: Access Permissions // Group: Access Permissions
gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), mainVBox );
gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setSpacing(KDialog::spacingHint());
gb->layout()->setMargin(KDialog::marginHint()); gb->layout()->setMargin(KDialog::marginHint());
@ -3702,7 +3702,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about swallowing // The groupbox about swallowing
TQGroupBox* tmpQGroupBox; TQGroupBox* tmpQGroupBox;
tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame ); tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame );
tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox); mainlayout->addWidget(tmpQGroupBox);
@ -3729,7 +3729,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about run in terminal // The groupbox about run in terminal
tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox = new TQGroupBox( d->m_frame );
tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox); mainlayout->addWidget(tmpQGroupBox);
@ -3768,7 +3768,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// The groupbox about run with substituted uid. // The groupbox about run with substituted uid.
tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox = new TQGroupBox( d->m_frame );
tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
mainlayout->addWidget(tmpQGroupBox); mainlayout->addWidget(tmpQGroupBox);

@ -377,7 +377,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri
return item; return item;
} }
void KURLBar::setOrientation( Qt::Orientation orient ) void KURLBar::setOrientation( TQt::Orientation orient )
{ {
m_listBox->setOrientation( orient ); m_listBox->setOrientation( orient );
setSizePolicy( TQSizePolicy( isVertical() ? setSizePolicy( TQSizePolicy( isVertical() ?
@ -388,7 +388,7 @@ void KURLBar::setOrientation( Qt::Orientation orient )
TQSizePolicy::Maximum )); TQSizePolicy::Maximum ));
} }
Qt::Orientation KURLBar::orientation() const TQt::Orientation KURLBar::orientation() const
{ {
return m_listBox->orientation(); return m_listBox->orientation();
} }
@ -399,7 +399,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
if ( !view ) { if ( !view ) {
m_listBox = new KURLBarListBox( this, "urlbar listbox" ); m_listBox = new KURLBarListBox( this, "urlbar listbox" );
setOrientation( Qt::Vertical ); setOrientation( TQt::Vertical );
} }
else { else {
m_listBox = view; m_listBox = view;
@ -520,7 +520,7 @@ TQSize KURLBar::minimumSizeHint() const
void KURLBar::slotSelected( int button, TQListBoxItem *item ) void KURLBar::slotSelected( int button, TQListBoxItem *item )
{ {
if ( button != Qt::LeftButton ) if ( button != TQt::LeftButton )
return; return;
slotSelected( item ); slotSelected( item );
@ -877,9 +877,9 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e )
} }
} }
void KURLBarListBox::setOrientation( Qt::Orientation orient ) void KURLBarListBox::setOrientation( TQt::Orientation orient )
{ {
if ( orient == Qt::Vertical ) { if ( orient == TQt::Vertical ) {
setColumnMode( 1 ); setColumnMode( 1 );
setRowMode( Variable ); setRowMode( Variable );
} }

@ -277,7 +277,7 @@ public:
* horizontally in one row. * horizontally in one row.
* @see orientation * @see orientation
*/ */
virtual void setOrientation( Qt::Orientation orient ); virtual void setOrientation( TQt::Orientation orient );
/** /**
* @returns the current orientation mode. * @returns the current orientation mode.
* @see setOrientation * @see setOrientation
@ -382,7 +382,7 @@ public:
/** /**
* @returns true if the bar is in vertical mode. * @returns true if the bar is in vertical mode.
*/ */
bool isVertical() const { return orientation() == Qt::Vertical; } bool isVertical() const { return orientation() == TQt::Vertical; }
public slots: public slots:
/** /**
@ -510,14 +510,14 @@ public:
* column. * column.
* @see orientation * @see orientation
*/ */
virtual void setOrientation( Qt::Orientation orient ); virtual void setOrientation( TQt::Orientation orient );
/** /**
* @returns the current orientation. * @returns the current orientation.
* @see setOrientation * @see setOrientation
*/ */
Qt::Orientation orientation() const { return m_orientation; } TQt::Orientation orientation() const { return m_orientation; }
bool isVertical() const { return m_orientation == Qt::Vertical; } bool isVertical() const { return m_orientation == TQt::Vertical; }
signals: signals:
/** /**
@ -537,7 +537,7 @@ protected:
virtual void paintEvent( TQPaintEvent* ); virtual void paintEvent( TQPaintEvent* );
private: private:
Qt::Orientation m_orientation; TQt::Orientation m_orientation;
KURLBarToolTip *m_toolTip; KURLBarToolTip *m_toolTip;
protected: protected:

@ -968,7 +968,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
menu->plug( toolbar ); menu->plug( toolbar );
//Insert a separator. //Insert a separator.
TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/, TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(TQt::Horizontal, false /*no line*/,
toolbar); toolbar);
d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget);
toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo); toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo);
@ -1083,13 +1083,13 @@ void KFileDialog::initGUI()
TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint()); TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint());
lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter); lafBox->addWidget(d->locationLabel, 0, 0, TQt::AlignVCenter);
lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter); lafBox->addWidget(locationEdit, 0, 1, TQt::AlignVCenter);
lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter); lafBox->addWidget(d->okButton, 0, 2, TQt::AlignVCenter);
lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter); lafBox->addWidget(d->filterLabel, 1, 0, TQt::AlignVCenter);
lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter); lafBox->addWidget(filterWidget, 1, 1, TQt::AlignVCenter);
lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter); lafBox->addWidget(d->cancelButton, 1, 2, TQt::AlignVCenter);
lafBox->setColStretch(1, 4); lafBox->setColStretch(1, 4);

@ -194,7 +194,7 @@ void KFileSharePropsPlugin::init()
vbox->addWidget( label, 0 ); vbox->addWidget( label, 0 );
m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget );
connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
vbox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter );
vbox->addStretch( 10 ); vbox->addStretch( 10 );
@ -221,7 +221,7 @@ void KFileSharePropsPlugin::init()
vbox->addLayout( hBox, 0 ); vbox->addLayout( hBox, 0 );
m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget );
connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
hBox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter );
vbox->addStretch( 10 ); // align items on top vbox->addStretch( 10 ); // align items on top
break; break;
} }

@ -1794,7 +1794,7 @@ void FileCopyJob::startDataPump()
m_putJob = put( m_dest, m_permissions, m_overwrite, m_resume, false /* no GUI */); m_putJob = put( m_dest, m_permissions, m_overwrite, m_resume, false /* no GUI */);
if ( d->m_modificationTime != static_cast<time_t>( -1 ) ) { if ( d->m_modificationTime != static_cast<time_t>( -1 ) ) {
TQDateTime dt; dt.setTime_t( d->m_modificationTime ); TQDateTime dt; dt.setTime_t( d->m_modificationTime );
m_putJob->addMetaData( "modified", dt.toString( Qt::ISODate ) ); m_putJob->addMetaData( "modified", dt.toString( TQt::ISODate ) );
} }
//kdDebug(7007) << "FileCopyJob: m_putJob = " << m_putJob << " m_dest=" << m_dest << endl; //kdDebug(7007) << "FileCopyJob: m_putJob = " << m_putJob << " m_dest=" << m_dest << endl;

@ -87,13 +87,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
{ {
lbl = new TQLabel( main ); lbl = new TQLabel( main );
lbl->setPixmap( pix ); lbl->setPixmap( pix );
lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); lbl->setAlignment( TQt::AlignLeft|TQt::AlignVCenter );
lbl->setFixedSize( lbl->sizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); d->layout->addWidget( lbl, 0, 0, TQt::AlignLeft );
} }
d->prompt = new TQLabel( main ); d->prompt = new TQLabel( main );
d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak ); d->prompt->setAlignment( TQt::AlignLeft|TQt::AlignVCenter|TQt::WordBreak );
d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); d->layout->addWidget( d->prompt, 0, 2, TQt::AlignLeft );
if ( prompt.isEmpty() ) if ( prompt.isEmpty() )
setPrompt( i18n( "You need to supply a username and a password" ) ); setPrompt( i18n( "You need to supply a username and a password" ) );
else else
@ -106,7 +106,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
// Row 4: Username field // Row 4: Username field
d->userNameLabel = new TQLabel( i18n("&Username:"), main ); d->userNameLabel = new TQLabel( i18n("&Username:"), main );
d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); d->userNameLabel->setAlignment( TQt::AlignVCenter | TQt::AlignLeft );
d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() );
d->userNameHBox = new TQHBox( main ); d->userNameHBox = new TQHBox( main );
@ -123,7 +123,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
// Row 6: Password field // Row 6: Password field
lbl = new TQLabel( i18n("&Password:"), main ); lbl = new TQLabel( i18n("&Password:"), main );
lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); lbl->setAlignment( TQt::AlignVCenter | TQt::AlignLeft );
lbl->setFixedSize( lbl->sizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
TQHBox* hbox = new TQHBox( main ); TQHBox* hbox = new TQHBox( main );
d->passEdit = new KLineEdit( hbox ); d->passEdit = new KLineEdit( hbox );
@ -239,13 +239,13 @@ void PasswordDialog::addCommentLine( const TQString& label,
TQWidget *main = mainWidget(); TQWidget *main = mainWidget();
TQLabel* lbl = new TQLabel( label, main); TQLabel* lbl = new TQLabel( label, main);
lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); lbl->setAlignment( TQt::AlignVCenter|TQt::AlignRight );
lbl->setFixedSize( lbl->sizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); d->layout->addWidget( lbl, d->nRow+2, 0, TQt::AlignLeft );
lbl = new TQLabel( comment, main); lbl = new TQLabel( comment, main);
lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); lbl->setAlignment( TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak );
calculateLabelSize(lbl); calculateLabelSize(lbl);
d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); d->layout->addWidget( lbl, d->nRow+2, 2, TQt::AlignLeft );
d->layout->addRowSpacing( 3, 10 ); // Add a spacer d->layout->addRowSpacing( 3, 10 ); // Add a spacer
d->nRow++; d->nRow++;
} }

@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) {
if ( ev->type() == TQEvent::MouseButtonPress ) { if ( ev->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent *e = (TQMouseEvent*)ev; TQMouseEvent *e = (TQMouseEvent*)ev;
if ( e->button() == Qt::LeftButton ) { // toggle view on left mouse button if ( e->button() == TQt::LeftButton ) { // toggle view on left mouse button
if ( mode == Label ) { if ( mode == Label ) {
mode = Progress; mode = Progress;
} else if ( mode == Progress ) { } else if ( mode == Progress ) {

@ -569,7 +569,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
// set modification time // set modification time
const TQString mtimeStr = metaData( "modified" ); const TQString mtimeStr = metaData( "modified" );
if ( !mtimeStr.isEmpty() ) { if ( !mtimeStr.isEmpty() ) {
TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate );
if ( dt.isValid() ) { if ( dt.isValid() ) {
KDE_struct_stat dest_statbuf; KDE_struct_stat dest_statbuf;
if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) { if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) {

@ -102,7 +102,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
hBox->setSpacing( KDialog::spacingHint() ); hBox->setSpacing( KDialog::spacingHint() );
TQLabel* icon = new TQLabel( hBox ); TQLabel* icon = new TQLabel( hBox );
icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) ); icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) );
icon->setAlignment( Qt::AlignCenter ); icon->setAlignment( TQt::AlignCenter );
icon->setFixedSize( 2*icon->sizeHint() ); icon->setFixedSize( 2*icon->sizeHint() );
int count = cookieList.count(); int count = cookieList.count();
@ -111,7 +111,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
TQString txt = i18n("You received a cookie from", TQString txt = i18n("You received a cookie from",
"You received %n cookies from", count); "You received %n cookies from", count);
TQLabel* lbl = new TQLabel( txt, vBox ); TQLabel* lbl = new TQLabel( txt, vBox );
lbl->setAlignment( Qt::AlignCenter ); lbl->setAlignment( TQt::AlignCenter );
KHttpCookiePtr cookie = cookieList.first(); KHttpCookiePtr cookie = cookieList.first();
TQString host (cookie->host()); TQString host (cookie->host());
@ -128,10 +128,10 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
if (cookie->isCrossDomain()) if (cookie->isCrossDomain())
txt += i18n(" <b>[Cross Domain!]</b>"); txt += i18n(" <b>[Cross Domain!]</b>");
lbl = new TQLabel( txt, vBox ); lbl = new TQLabel( txt, vBox );
lbl->setAlignment( Qt::AlignCenter ); lbl->setAlignment( TQt::AlignCenter );
lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox ); lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox );
lbl->setAlignment( Qt::AlignCenter ); lbl->setAlignment( TQt::AlignCenter );
vlayout->addWidget( hBox, 0, Qt::AlignLeft ); vlayout->addWidget( hBox, 0, TQt::AlignLeft );
// Cookie Details dialog... // Cookie Details dialog...
m_detailView = new KCookieDetail( cookieList, count, this ); m_detailView = new KCookieDetail( cookieList, count, this );
@ -190,7 +190,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
bbLay->addStretch( 1 ); bbLay->addStretch( 1 );
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
TQAccel* a = new TQAccel( this ); TQAccel* a = new TQAccel( this );
a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) ); a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQT_SLOT(animateClick()) );
#endif #endif
m_button = new TQPushButton( bbox ); m_button = new TQPushButton( bbox );

@ -249,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
void KMdiChildArea::mousePressEvent( TQMouseEvent *e ) void KMdiChildArea::mousePressEvent( TQMouseEvent *e )
{ {
//Popup the window menu //Popup the window menu
if ( e->button() & Qt::RightButton ) if ( e->button() & TQt::RightButton )
emit popupWindowMenu( mapToGlobal( e->pos() ) ); emit popupWindowMenu( mapToGlobal( e->pos() ) );
} }

@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( m_bResizing ) if ( m_bResizing )
{ {
if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) ) if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) )
{ {
// same as: if no button or left button pressed // same as: if no button or left button pressed
TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );

@ -85,7 +85,7 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption()
void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
setMouseTracking( false ); setMouseTracking( false );
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
@ -95,7 +95,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
m_pParent->m_bDragging = true; m_pParent->m_bDragging = true;
m_offset = mapToParent( e->pos() ); m_offset = mapToParent( e->pos() );
} }
else if ( e->button() == Qt::RightButton ) else if ( e->button() == TQt::RightButton )
{ {
m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) ); m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) );
} }
@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();

@ -524,7 +524,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( e->type() == TQEvent::KeyPress && isAttached() ) if ( e->type() == TQEvent::KeyPress && isAttached() )
{ {
TQKeyEvent* ke = ( TQKeyEvent* ) e; TQKeyEvent* ke = ( TQKeyEvent* ) e;
if ( ke->key() == Qt::Key_Tab ) if ( ke->key() == TQt::Key_Tab )
{ {
TQWidget* w = ( TQWidget* ) obj; TQWidget* w = ( TQWidget* ) obj;
TQWidget::FocusPolicy wfp = w->focusPolicy(); TQWidget::FocusPolicy wfp = w->focusPolicy();

@ -465,7 +465,7 @@ protected:
virtual void closeEvent( TQCloseEvent *e ); virtual void closeEvent( TQCloseEvent *e );
/** /**
* It only catches TQEvent::KeyPress events there. If a Qt::Key_Tab is pressed, the internal MDI focus * It only catches TQEvent::KeyPress events there. If a TQt::Key_Tab is pressed, the internal MDI focus
* handling is called. That means if the last focusable child widget of this is called, it will jump to the * handling is called. That means if the last focusable child widget of this is called, it will jump to the
* first focusable child widget of this. * first focusable child widget of this.
* See KMdiChildView::setFirstFocusableChildWidget and KMdiChildView::lastFirstFocusableChildWidget * See KMdiChildView::setFirstFocusableChildWidget and KMdiChildView::lastFirstFocusableChildWidget

@ -77,10 +77,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e )
{ {
switch ( e->button() ) switch ( e->button() )
{ {
case Qt::LeftButton: case TQt::LeftButton:
emit leftMouseButtonClicked( m_pWindow ); emit leftMouseButtonClicked( m_pWindow );
break; break;
case Qt::RightButton: case TQt::RightButton:
emit rightMouseButtonClicked( m_pWindow ); emit rightMouseButtonClicked( m_pWindow );
break; break;
default: default:
@ -363,7 +363,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
newButtonWidth = buttonAreaWidth / buttonCount; newButtonWidth = buttonAreaWidth / buttonCount;
else else
newButtonWidth = 0; newButtonWidth = 0;
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
newButtonWidth = 80; newButtonWidth = 80;
if ( newButtonWidth > 0 ) if ( newButtonWidth > 0 )
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )

@ -54,7 +54,7 @@ int main( int argc, char **argv )
Hello* h1 = new Hello( "Hello1", "Click the right mouse button on the mainframe!", mainWdg); Hello* h1 = new Hello( "Hello1", "Click the right mouse button on the mainframe!", mainWdg);
h1->setTabCaption("Tab changed"); h1->setTabCaption("Tab changed");
h1->setBackgroundColor( Qt::white ); h1->setBackgroundColor( TQt::white );
mainWdg->addWindow( h1); mainWdg->addWindow( h1);
// SHOW(h1->caption()); // SHOW(h1->caption());
// SHOW(h1->tabCaption()); // SHOW(h1->tabCaption());
@ -66,7 +66,7 @@ int main( int argc, char **argv )
// SHOW(h2->tabCaption()); // SHOW(h2->tabCaption());
Hello* h3 = new Hello( "Hello3", "Dock me using the taskbar button context menu!", 0); Hello* h3 = new Hello( "Hello3", "Dock me using the taskbar button context menu!", 0);
h3->setBackgroundColor( Qt::white ); h3->setBackgroundColor( TQt::white );
h3->setFont( TQFont("times",20,TQFont::Bold) ); h3->setFont( TQFont("times",20,TQFont::Bold) );
mainWdg->addWindow( h3, KMdi::Detach ); // undock this! mainWdg->addWindow( h3, KMdi::Detach ); // undock this!
h3->setGeometry( 20, 20, 400, 100); h3->setGeometry( 20, 20, 400, 100);

@ -439,7 +439,7 @@ int DownloadDialog::installStatus(Entry *entry)
if(datestring.isNull()) installed = 0; if(datestring.isNull()) installed = 0;
else else
{ {
date = TQDate::fromString(datestring, Qt::ISODate); date = TQDate::fromString(datestring, TQt::ISODate);
if(!date.isValid()) installed = 0; if(!date.isValid()) installed = 0;
else if(date < entry->releaseDate()) installed = -1; else if(date < entry->releaseDate()) installed = -1;
else installed = 1; else installed = 1;
@ -668,7 +668,7 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job )
void DownloadDialog::install(Entry *e) void DownloadDialog::install(Entry *e)
{ {
kapp->config()->setGroup("TDENewStuffStatus"); kapp->config()->setGroup("TDENewStuffStatus");
kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate)));
kapp->config()->sync(); kapp->config()->sync();
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);

@ -332,7 +332,7 @@ void Entry::parseDomElement( const TQDomElement &element )
if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() ); if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() );
// if ( e.tagName() == "release" ) setRelease( e.text().toInt() ); // if ( e.tagName() == "release" ) setRelease( e.text().toInt() );
if ( e.tagName() == "created" ) { if ( e.tagName() == "created" ) {
TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ); TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), TQt::ISODate );
setReleaseDate( date ); setReleaseDate( date );
} }
if ( e.tagName() == "smallpreviewpic1" ) { if ( e.tagName() == "smallpreviewpic1" ) {
@ -366,7 +366,7 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
addElement( doc, entry, "downloads", TQString::number( downloads() ) ); addElement( doc, entry, "downloads", TQString::number( downloads() ) );
addElement( doc, entry, "created", addElement( doc, entry, "created",
releaseDate().toString( Qt::ISODate ) ); releaseDate().toString( TQt::ISODate ) );
addElement( doc, entry, "description", summary() ); addElement( doc, entry, "description", summary() );
addElement( doc, entry, "preview", preview().url() ); addElement( doc, entry, "preview", preview().url() );

@ -45,7 +45,7 @@ public:
m_selectedWidget = 0; m_selectedWidget = 0;
m_bAllowNestedParts = false; m_bAllowNestedParts = false;
m_bIgnoreScrollBars = false; m_bIgnoreScrollBars = false;
m_activationButtonMask = Qt::LeftButton | Qt::MidButton | Qt::RightButton; m_activationButtonMask = TQt::LeftButton | TQt::MidButton | TQt::RightButton;
m_reason = PartManager::NoReason; m_reason = PartManager::NoReason;
} }
~PartManagerPrivate() ~PartManagerPrivate()
@ -56,9 +56,9 @@ public:
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonDblClick: { case TQEvent::MouseButtonDblClick: {
TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev ); TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev );
m_reason = mev->button() == Qt::LeftButton m_reason = mev->button() == TQt::LeftButton
? PartManager::ReasonLeftClick ? PartManager::ReasonLeftClick
: ( mev->button() == Qt::MidButton : ( mev->button() == TQt::MidButton
? PartManager::ReasonMidClick ? PartManager::ReasonMidClick
: PartManager::ReasonRightClick ); : PartManager::ReasonRightClick );
break; break;

@ -130,7 +130,7 @@ public:
/** /**
* Specifies which mouse buttons the partmanager should react upon. * Specifies which mouse buttons the partmanager should react upon.
* By default it reacts on all mouse buttons (LMB/MMB/RMB). * By default it reacts on all mouse buttons (LMB/MMB/RMB).
* @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton * @param buttonMask a combination of TQt::ButtonState values e.g. TQt::LeftButton | TQt::MidButton
*/ */
void setActivationButtonMask( short int buttonMask ); void setActivationButtonMask( short int buttonMask );
/** /**

@ -64,7 +64,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
TQFont f(m_title->font()); TQFont f(m_title->font());
f.setBold(true); f.setBold(true);
m_title->setFont(f); m_title->setFont(f);
KSeparator *m_sep = new KSeparator(Qt::Horizontal, this); KSeparator *m_sep = new KSeparator(TQt::Horizontal, this);
m_textinfo = new TQLabel( this ); m_textinfo = new TQLabel( this );
m_logined = new TQLineEdit( this ); m_logined = new TQLineEdit( this );
m_passwded = new TQLineEdit( this ); m_passwded = new TQLineEdit( this );

@ -41,8 +41,8 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(type_, 0, 1); m1->addWidget(type_, 0, 1);
m1->addWidget(address_, 1, 1); m1->addWidget(address_, 1, 1);

@ -49,9 +49,9 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
TQLabel *l3 = new TQLabel(i18n("To:"), dummy); TQLabel *l3 = new TQLabel(i18n("To:"), dummy);
TQGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(type_, 0, 1); m1->addWidget(type_, 0, 1);
m1->addWidget(from_, 1, 1); m1->addWidget(from_, 1, 1);
m1->addWidget(to_, 2, 1); m1->addWidget(to_, 2, 1);

@ -79,12 +79,12 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
m2->addWidget(cups_); m2->addWidget(cups_);
m2->addWidget(slp_); m2->addWidget(slp_);
m2->addStretch(1); m2->addStretch(1);
m1->addWidget(l1, 1, 0, Qt::AlignRight); m1->addWidget(l1, 1, 0, TQt::AlignRight);
m1->addWidget(l2, 2, 0, Qt::AlignRight); m1->addWidget(l2, 2, 0, TQt::AlignRight);
m1->addWidget(l3, 3, 0, Qt::AlignRight); m1->addWidget(l3, 3, 0, TQt::AlignRight);
m1->addWidget(l4, 4, 0, Qt::AlignRight|Qt::AlignTop); m1->addWidget(l4, 4, 0, TQt::AlignRight|TQt::AlignTop);
m1->addWidget(l5, 5, 0, Qt::AlignRight); m1->addWidget(l5, 5, 0, TQt::AlignRight);
m1->addWidget(l6, 6, 0, Qt::AlignRight|Qt::AlignTop); m1->addWidget(l6, 6, 0, TQt::AlignRight|TQt::AlignTop);
m1->addWidget(browseport_, 1, 1); m1->addWidget(browseport_, 1, 1);
m1->addWidget(browseinterval_, 2, 1); m1->addWidget(browseinterval_, 2, 1);
m1->addWidget(browsetimeout_, 3, 1); m1->addWidget(browsetimeout_, 3, 1);

@ -54,13 +54,13 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7);
m1->setRowStretch(7, 1); m1->setRowStretch(7, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight|Qt::AlignTop); m1->addWidget(l3, 2, 0, TQt::AlignRight|TQt::AlignTop);
m1->addWidget(l4, 3, 0, Qt::AlignRight); m1->addWidget(l4, 3, 0, TQt::AlignRight);
m1->addWidget(l5, 4, 0, Qt::AlignRight); m1->addWidget(l5, 4, 0, TQt::AlignRight);
m1->addWidget(l6, 5, 0, Qt::AlignRight); m1->addWidget(l6, 5, 0, TQt::AlignRight);
m1->addWidget(l7, 6, 0, Qt::AlignRight); m1->addWidget(l7, 6, 0, TQt::AlignRight);
m1->addWidget(datadir_, 0, 1); m1->addWidget(datadir_, 0, 1);
m1->addWidget(documentdir_, 1, 1); m1->addWidget(documentdir_, 1, 1);
m1->addWidget(fontpath_, 2, 1); m1->addWidget(fontpath_, 2, 1);

@ -54,10 +54,10 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7);
m1->setRowStretch(4, 1); m1->setRowStretch(4, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(l4, 3, 0, Qt::AlignRight); m1->addWidget(l4, 3, 0, TQt::AlignRight);
m1->addWidget(user_, 0, 1); m1->addWidget(user_, 0, 1);
m1->addWidget(group_, 1, 1); m1->addWidget(group_, 1, 1);
m1->addWidget(ripcache_, 2, 1); m1->addWidget(ripcache_, 2, 1);

@ -62,9 +62,9 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
m1->addWidget(keepjobhistory_, 0, 1); m1->addWidget(keepjobhistory_, 0, 1);
m1->addWidget(keepjobfiles_, 1, 1); m1->addWidget(keepjobfiles_, 1, 1);
m1->addWidget(autopurgejobs_, 2, 1); m1->addWidget(autopurgejobs_, 2, 1);
m1->addWidget(l1, 3, 0, Qt::AlignRight); m1->addWidget(l1, 3, 0, TQt::AlignRight);
m1->addWidget(l2, 4, 0, Qt::AlignRight); m1->addWidget(l2, 4, 0, TQt::AlignRight);
m1->addWidget(l3, 5, 0, Qt::AlignRight); m1->addWidget(l3, 5, 0, TQt::AlignRight);
m1->addWidget(maxjobs_, 3, 1); m1->addWidget(maxjobs_, 3, 1);
m1->addWidget(maxjobsperprinter_, 4, 1); m1->addWidget(maxjobsperprinter_, 4, 1);
m1->addWidget(maxjobsperuser_, 5, 1); m1->addWidget(maxjobsperuser_, 5, 1);

@ -66,11 +66,11 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7);
m1->setRowStretch(5, 1); m1->setRowStretch(5, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(l4, 3, 0, Qt::AlignRight); m1->addWidget(l4, 3, 0, TQt::AlignRight);
m1->addWidget(l5, 4, 0, Qt::AlignRight); m1->addWidget(l5, 4, 0, TQt::AlignRight);
m1->addWidget(accesslog_, 0, 1); m1->addWidget(accesslog_, 0, 1);
m1->addWidget(errorlog_, 1, 1); m1->addWidget(errorlog_, 1, 1);
m1->addWidget(pagelog_, 2, 1); m1->addWidget(pagelog_, 2, 1);

@ -74,12 +74,12 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7);
m1->setRowStretch(7, 1); m1->setRowStretch(7, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 2, 0, Qt::AlignRight); m1->addWidget(l2, 2, 0, TQt::AlignRight);
m1->addWidget(l3, 3, 0, Qt::AlignRight); m1->addWidget(l3, 3, 0, TQt::AlignRight);
m1->addWidget(l4, 4, 0, Qt::AlignRight); m1->addWidget(l4, 4, 0, TQt::AlignRight);
m1->addWidget(l5, 5, 0, Qt::AlignRight); m1->addWidget(l5, 5, 0, TQt::AlignRight);
m1->addWidget(l6, 6, 0, Qt::AlignTop|Qt::AlignRight); m1->addWidget(l6, 6, 0, TQt::AlignTop|TQt::AlignRight);
m1->addWidget(keepalive_, 1, 1); m1->addWidget(keepalive_, 1, 1);
m1->addWidget(hostnamelookup_, 0, 1); m1->addWidget(hostnamelookup_, 0, 1);
m1->addWidget(keepalivetimeout_, 2, 1); m1->addWidget(keepalivetimeout_, 2, 1);

@ -55,11 +55,11 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7);
m1->setRowStretch(5, 1); m1->setRowStretch(5, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(l4, 3, 0, Qt::AlignRight); m1->addWidget(l4, 3, 0, TQt::AlignRight);
m1->addWidget(l5, 4, 0, Qt::AlignRight|Qt::AlignTop); m1->addWidget(l5, 4, 0, TQt::AlignRight|TQt::AlignTop);
m1->addWidget(remoteroot_, 0, 1); m1->addWidget(remoteroot_, 0, 1);
m1->addWidget(systemgroup_, 1, 1); m1->addWidget(systemgroup_, 1, 1);
m1->addWidget(encryptcert_, 2, 1); m1->addWidget(encryptcert_, 2, 1);

@ -97,13 +97,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7);
m1->setRowStretch(8, 1); m1->setRowStretch(8, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(l4, 4, 0, Qt::AlignRight); m1->addWidget(l4, 4, 0, TQt::AlignRight);
m1->addWidget(l5, 5, 0, Qt::AlignRight); m1->addWidget(l5, 5, 0, TQt::AlignRight);
m1->addWidget(l6, 6, 0, Qt::AlignRight); m1->addWidget(l6, 6, 0, TQt::AlignRight);
m1->addWidget(l7, 7, 0, Qt::AlignRight); m1->addWidget(l7, 7, 0, TQt::AlignRight);
m1->addWidget(servername_, 0, 1); m1->addWidget(servername_, 0, 1);
m1->addWidget(serveradmin_, 1, 1); m1->addWidget(serveradmin_, 1, 1);
m1->addWidget(charset_, 4, 1); m1->addWidget(charset_, 4, 1);

@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
TQLabel *cupslogo_ = new TQLabel(this); TQLabel *cupslogo_ = new TQLabel(this);
TQString logopath = locate("data", TQString("tdeprint/cups_logo.png")); TQString logopath = locate("data", TQString("tdeprint/cups_logo.png"));
cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
cupslogo_->setAlignment(Qt::AlignCenter); cupslogo_->setAlignment(TQt::AlignCenter);
TQLabel *kupslogo_ = new TQLabel(this); TQLabel *kupslogo_ = new TQLabel(this);
logopath = locate("data", TQString("tdeprint/kde_logo.png")); logopath = locate("data", TQString("tdeprint/kde_logo.png"));
kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
kupslogo_->setAlignment(Qt::AlignCenter); kupslogo_->setAlignment(TQt::AlignCenter);
TQLabel *helptxt_ = new TQLabel(this); TQLabel *helptxt_ = new TQLabel(this);
helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. "

@ -80,14 +80,14 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
TQGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, TQt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, TQt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, TQt::AlignRight);
m1->addWidget(l4, 3, 0, Qt::AlignRight); m1->addWidget(l4, 3, 0, TQt::AlignRight);
m1->addWidget(l5, 4, 0, Qt::AlignRight); m1->addWidget(l5, 4, 0, TQt::AlignRight);
m1->addWidget(l6, 5, 0, Qt::AlignRight); m1->addWidget(l6, 5, 0, TQt::AlignRight);
m1->addWidget(l7, 6, 0, Qt::AlignRight); m1->addWidget(l7, 6, 0, TQt::AlignRight);
m1->addWidget(l8, 7, 0, Qt::AlignRight|Qt::AlignTop); m1->addWidget(l8, 7, 0, TQt::AlignRight|TQt::AlignTop);
m1->addWidget(resource_, 0, 1); m1->addWidget(resource_, 0, 1);
m1->addWidget(authtype_, 1, 1); m1->addWidget(authtype_, 1, 1);
m1->addWidget(authclass_, 2, 1); m1->addWidget(authclass_, 2, 1);

@ -46,8 +46,8 @@ 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(TQT_TQLAYOUT(m2));
m2->addWidget(l1, 0, 0, Qt::AlignRight); m2->addWidget(l1, 0, 0, TQt::AlignRight);
m2->addWidget(l2, 1, 0, Qt::AlignRight); m2->addWidget(l2, 1, 0, TQt::AlignRight);
m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1);
m2->addWidget(address_, 0, 1); m2->addWidget(address_, 0, 1);
m2->addWidget(port_, 1, 1); m2->addWidget(port_, 1, 1);

@ -25,16 +25,16 @@
static void draw3DPage(TQPainter *p, TQRect r) static void draw3DPage(TQPainter *p, TQRect r)
{ {
// draw white page // draw white page
p->fillRect(r,Qt::white); p->fillRect(r,TQt::white);
// draw 3D border // draw 3D border
p->setPen(Qt::black); p->setPen(TQt::black);
p->moveTo(r.left(),r.bottom()); p->moveTo(r.left(),r.bottom());
p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.bottom());
p->lineTo(r.right(),r.top()); p->lineTo(r.right(),r.top());
p->setPen(Qt::darkGray); p->setPen(TQt::darkGray);
p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.top());
p->lineTo(r.left(),r.bottom()); p->lineTo(r.left(),r.bottom());
p->setPen(Qt::gray); p->setPen(TQt::gray);
p->moveTo(r.left()+1,r.bottom()-1); p->moveTo(r.left()+1,r.bottom()-1);
p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1);
p->lineTo(r.right()-1,r.top()+1); p->lineTo(r.right()-1,r.top()+1);

@ -62,7 +62,7 @@ void IppReportDlg::slotUser1()
rich.draw(&painter, margin, margin, r, colorGroup()); rich.draw(&painter, margin, margin, r, colorGroup());
TQString s = caption() + ": " + TQString::number(page); TQString s = caption() + ": " + TQString::number(page);
TQRect br = painter.fontMetrics().boundingRect(s); TQRect br = painter.fontMetrics().boundingRect(s);
painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, TQt::AlignRight|TQt::AlignTop, s);
r.moveBy(0, r.height()-10); r.moveBy(0, r.height()-10);
painter.translate(0, -(r.height()-10)); painter.translate(0, -(r.height()-10));
if (r.top() < hh) if (r.top() < hh)

@ -35,7 +35,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
setPageHeader(i18n("CUPS Folder Settings")); setPageHeader(i18n("CUPS Folder Settings"));
setPagePixmap("folder"); setPagePixmap("folder");
TQGroupBox *m_dirbox = new TQGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this); TQGroupBox *m_dirbox = new TQGroupBox(0, TQt::Vertical, i18n("Installation Folder"), this);
m_installdir = new KURLRequester(m_dirbox); m_installdir = new KURLRequester(m_dirbox);
m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly)); m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly));
m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox); m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox);

@ -62,8 +62,8 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
: TQWidget(parent,name) : TQWidget(parent,name)
{ {
// widget creation // widget creation
TQGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this); TQGroupBox *m_hostbox = new TQGroupBox(0, TQt::Vertical, i18n("Server Information"), this);
TQGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this); TQGroupBox *m_loginbox = new TQGroupBox(0, TQt::Vertical, i18n("Account Information"), this);
TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox);
TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox);
m_host = new TQLineEdit(m_hostbox); m_host = new TQLineEdit(m_hostbox);

@ -234,7 +234,7 @@ void KMCupsUiManager::setupPrintDialogPages(TQPtrList<KPrintDialogPage>* pages)
void KMCupsUiManager::setupJobViewer(TQListView *lv) void KMCupsUiManager::setupJobViewer(TQListView *lv)
{ {
lv->addColumn(i18n("Priority")); lv->addColumn(i18n("Priority"));
lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter);
lv->addColumn(i18n("Billing Information")); lv->addColumn(i18n("Billing Information"));
lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter);
} }

@ -110,7 +110,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
setTitle("HP-GL/2"); setTitle("HP-GL/2");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("HP-GL/2 Options"), this);
m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box); m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box);
TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page);
@ -119,7 +119,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page); TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page);
m_penwidth = new KIntNumInput(1000, box); m_penwidth = new KIntNumInput(1000, box);
m_penwidth->setLabel(i18n("&Pen width:"), Qt::AlignLeft|Qt::AlignVCenter); m_penwidth->setLabel(i18n("&Pen width:"), TQt::AlignLeft|TQt::AlignVCenter);
m_penwidth->setSuffix(" [um]"); m_penwidth->setSuffix(" [um]");
m_penwidth->setRange(0, 10000, 100, true); m_penwidth->setRange(0, 10000, 100, true);
TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page);

@ -236,11 +236,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
setTitle(i18n("Image")); setTitle(i18n("Image"));
TQGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); TQGroupBox *colorbox = new TQGroupBox(0, TQt::Vertical, i18n("Color Settings"), this);
TQWhatsThis::add(this, whatsThisImagePage); TQWhatsThis::add(this, whatsThisImagePage);
TQGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this); TQGroupBox *sizebox = new TQGroupBox(0, TQt::Vertical, i18n("Image Size"), this);
TQWhatsThis::add(sizebox, whatsThisSizeImagePage); TQWhatsThis::add(sizebox, whatsThisSizeImagePage);
TQGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this); TQGroupBox *positionbox = new TQGroupBox(0, TQt::Vertical, i18n("Image Position"), this);
TQWhatsThis::add(positionbox, whatsThisPositionImagePage); TQWhatsThis::add(positionbox, whatsThisPositionImagePage);
m_brightness = new KIntNumInput(100, colorbox); m_brightness = new KIntNumInput(100, colorbox);
@ -278,7 +278,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
TQImage img(locate("data", "tdeprint/preview.png")); TQImage img(locate("data", "tdeprint/preview.png"));
m_preview->setImage(img); m_preview->setImage(img);
KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); KSeparator *sep = new KSeparator(TQt::Horizontal, colorbox);
TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox);
TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage);
@ -374,12 +374,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
l3->addLayout(l4, 0, 1); l3->addLayout(l4, 0, 1);
l3->addLayout(l5, 1, 0); l3->addLayout(l5, 1, 0);
l3->addWidget(m_position, 1, 1); l3->addWidget(m_position, 1, 1);
l4->addWidget(left, Qt::AlignLeft); l4->addWidget(left, TQt::AlignLeft);
l4->addWidget(hcenter, Qt::AlignCenter); l4->addWidget(hcenter, TQt::AlignCenter);
l4->addWidget(right, Qt::AlignRight); l4->addWidget(right, TQt::AlignRight);
l5->addWidget(top, Qt::AlignTop); l5->addWidget(top, TQt::AlignTop);
l5->addWidget(vcenter, Qt::AlignVCenter); l5->addWidget(vcenter, TQt::AlignVCenter);
l5->addWidget(bottom, Qt::AlignBottom); l5->addWidget(bottom, TQt::AlignBottom);
} }
KPImagePage::~KPImagePage() KPImagePage::~KPImagePage()

@ -166,7 +166,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
TQLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this); TQLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this);
TQWhatsThis::add(lab2, whatsThisPageLabel); TQWhatsThis::add(lab2, whatsThisPageLabel);
lab2->setBuddy(m_pagelabel); lab2->setBuddy(m_pagelabel);
m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft); m_priority->setLabel(i18n("&Job priority:"), TQt::AlignVCenter|TQt::AlignLeft);
TQWhatsThis::add(m_priority, whatsThisJobPriority); TQWhatsThis::add(m_priority, whatsThisJobPriority);
KSeparator *sep0 = new KSeparator(this); KSeparator *sep0 = new KSeparator(this);

@ -188,31 +188,31 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
setTitle(i18n("Text")); setTitle(i18n("Text"));
m_block = false; m_block = false;
TQGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this); TQGroupBox *formatbox = new TQGroupBox(0, TQt::Vertical, i18n("Text Format"), this);
TQWhatsThis::add(formatbox, whatsThisFormatTextPage); TQWhatsThis::add(formatbox, whatsThisFormatTextPage);
TQGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); TQGroupBox *prettybox = new TQGroupBox(0, TQt::Vertical, i18n("Syntax Highlighting"), this);
TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage);
TQGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this); TQGroupBox *marginbox = new TQGroupBox(0, TQt::Vertical, i18n("Margins"), this);
TQWhatsThis::add(marginbox, whatsThisMarginsTextPage); TQWhatsThis::add(marginbox, whatsThisMarginsTextPage);
m_cpi = new KIntNumInput(10, formatbox); m_cpi = new KIntNumInput(10, formatbox);
TQWhatsThis::add(m_cpi, whatsThisCPITextPage); TQWhatsThis::add(m_cpi, whatsThisCPITextPage);
m_cpi->setLabel(i18n("&Chars per inch:"), Qt::AlignLeft|Qt::AlignVCenter); m_cpi->setLabel(i18n("&Chars per inch:"), TQt::AlignLeft|TQt::AlignVCenter);
m_cpi->setRange(1, 999, 1, false); m_cpi->setRange(1, 999, 1, false);
m_lpi = new KIntNumInput(m_cpi, 6, formatbox); m_lpi = new KIntNumInput(m_cpi, 6, formatbox);
TQWhatsThis::add(m_lpi, whatsThisLPITextPage); TQWhatsThis::add(m_lpi, whatsThisLPITextPage);
m_lpi->setLabel(i18n("&Lines per inch:"), Qt::AlignLeft|Qt::AlignVCenter); m_lpi->setLabel(i18n("&Lines per inch:"), TQt::AlignLeft|TQt::AlignVCenter);
m_lpi->setRange(1, 999, 1, false); m_lpi->setRange(1, 999, 1, false);
m_columns = new KIntNumInput(m_lpi, 1, formatbox); m_columns = new KIntNumInput(m_lpi, 1, formatbox);
TQWhatsThis::add(m_columns, whatsThisColumnsTextPage); TQWhatsThis::add(m_columns, whatsThisColumnsTextPage);
m_columns->setLabel(i18n("C&olumns:"), Qt::AlignLeft|Qt::AlignVCenter); m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter);
m_columns->setRange(1, 10, 1, false); m_columns->setRange(1, 10, 1, false);
KSeparator *sep = new KSeparator(Qt::Horizontal, formatbox); KSeparator *sep = new KSeparator(TQt::Horizontal, formatbox);
connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int)));
m_prettypix = new TQLabel(prettybox); m_prettypix = new TQLabel(prettybox);
TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage);
m_prettypix->setAlignment(Qt::AlignCenter); m_prettypix->setAlignment(TQt::AlignCenter);
TQRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox);
TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage);
TQRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); TQRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox);

@ -91,7 +91,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
if (!m_item || !m_item->isOption() || isSelected()) if (!m_item || !m_item->isOption() || isSelected())
{ {
p->setPen((isSelected() ? cg.highlightedText() : (m_conflict ? red : cg.text()))); p->setPen((isSelected() ? cg.highlightedText() : (m_conflict ? red : cg.text())));
p->drawText(w,0,width-w,height(),Qt::AlignLeft|Qt::AlignVCenter,text(0)); p->drawText(w,0,width-w,height(),TQt::AlignLeft|TQt::AlignVCenter,text(0));
} }
else else
{ {
@ -99,17 +99,17 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
TQString s(m_item->get("text") + ": <"); TQString s(m_item->get("text") + ": <");
w1 = p->fontMetrics().width(s); w1 = p->fontMetrics().width(s);
p->setPen(cg.text()); p->setPen(cg.text());
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
w += w1; w += w1;
p->setPen((m_conflict ? red : darkGreen)); p->setPen((m_conflict ? red : darkGreen));
s = m_item->prettyText(); s = m_item->prettyText();
w1 = p->fontMetrics().width(s); w1 = p->fontMetrics().width(s);
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
w += w1; w += w1;
p->setPen(cg.text()); p->setPen(cg.text());
s = TQString::fromLatin1(">"); s = TQString::fromLatin1(">");
w1 = p->fontMetrics().width(s); w1 = p->fontMetrics().width(s);
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
} }
} }

@ -95,7 +95,7 @@ DriverView::DriverView(TQWidget *parent, const char *name)
m_driver = 0; m_driver = 0;
TQSplitter *splitter = new TQSplitter(this); TQSplitter *splitter = new TQSplitter(this);
splitter->setOrientation(Qt::Vertical); splitter->setOrientation(TQt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10);
vbox->addWidget(splitter); vbox->addWidget(splitter);

@ -56,7 +56,7 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name)
: OptionBaseView(parent,name) : OptionBaseView(parent,name)
{ {
m_edit = new TQLineEdit(this); m_edit = new TQLineEdit(this);
m_slider = new TQSlider(Qt::Horizontal,this); m_slider = new TQSlider(TQt::Horizontal,this);
m_slider->setTickmarks(TQSlider::Below); m_slider->setTickmarks(TQSlider::Below);
TQLabel *lab = new TQLabel(i18n("Value:"),this); TQLabel *lab = new TQLabel(i18n("Value:"),this);
m_minval = new TQLabel(this); m_minval = new TQLabel(this);
@ -305,7 +305,7 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
m_stack->raiseWidget(w); m_stack->raiseWidget(w);
setTitle(i18n("No Option Selected")); setTitle(i18n("No Option Selected"));
setColumnLayout(0, Qt::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(TQT_TQLAYOUT(layout()), KDialog::marginHint());

@ -165,7 +165,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
setId(KPrinter::CopiesPage); setId(KPrinter::CopiesPage);
// widget creation // widget creation
TQButtonGroup *m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this); TQButtonGroup *m_pagebox = new TQButtonGroup(0, TQt::Vertical, i18n("Page Selection"), this);
TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel); TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel);
m_all = new TQRadioButton(i18n("&All"), m_pagebox); m_all = new TQRadioButton(i18n("&All"), m_pagebox);
TQWhatsThis::add(m_all, whatsThisAllPagesLabel); TQWhatsThis::add(m_all, whatsThisAllPagesLabel);
@ -180,14 +180,14 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
// TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); // TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
//TQLabel *m_rangeexpl = new TQLabel(m_pagebox); //TQLabel *m_rangeexpl = new TQLabel(m_pagebox);
//m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); //m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
TQGroupBox *m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this); TQGroupBox *m_copybox = new TQGroupBox(0, TQt::Vertical, i18n("Output Settings"), this);
TQWhatsThis::add(m_copybox, whatsThisCopiesLabel); TQWhatsThis::add(m_copybox, whatsThisCopiesLabel);
m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox); m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox);
TQWhatsThis::add(m_collate, whatsThisCollateLabel); TQWhatsThis::add(m_collate, whatsThisCollateLabel);
m_order = new TQCheckBox(i18n("Re&verse"), m_copybox); m_order = new TQCheckBox(i18n("Re&verse"), m_copybox);
TQWhatsThis::add(m_order, whatsThisReverseLabel); TQWhatsThis::add(m_order, whatsThisReverseLabel);
m_collatepix = new TQLabel(m_copybox); m_collatepix = new TQLabel(m_copybox);
m_collatepix->setAlignment(Qt::AlignCenter); m_collatepix->setAlignment(TQt::AlignCenter);
m_collatepix->setMinimumHeight(70); m_collatepix->setMinimumHeight(70);
TQLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); TQLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox);
m_copies = new TQSpinBox(m_copybox); m_copies = new TQSpinBox(m_copybox);
@ -203,7 +203,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
TQLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox); TQLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox);
m_pagesetlabel->setBuddy(m_pageset); m_pagesetlabel->setBuddy(m_pageset);
TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel); TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel);
KSeparator *sepline = new KSeparator(Qt::Horizontal, m_pagebox); KSeparator *sepline = new KSeparator(TQt::Horizontal, m_pagebox);
sepline->setMinimumHeight(10); sepline->setMinimumHeight(10);
TQWidget::setTabOrder( m_all, m_current ); TQWidget::setTabOrder( m_all, m_current );

@ -262,15 +262,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
// widget creation // widget creation
TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel);
TQLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); TQLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this);
m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); m_papertypelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel);
TQLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); TQLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this);
m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); m_inputslotlabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel);
m_pagesize = new TQComboBox(this); m_pagesize = new TQComboBox(this);
@ -286,16 +286,16 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
m_papertypelabel->setBuddy(m_papertype); m_papertypelabel->setBuddy(m_papertype);
m_inputslotlabel->setBuddy(m_inputslot); m_inputslotlabel->setBuddy(m_inputslot);
m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this);
TQWhatsThis::add(m_orientbox, whatsThisGeneralOrientationLabel); TQWhatsThis::add(m_orientbox, whatsThisGeneralOrientationLabel);
m_duplexbox = new TQButtonGroup(0, Qt::Vertical, i18n("Duplex Printing"), this); m_duplexbox = new TQButtonGroup(0, TQt::Vertical, i18n("Duplex Printing"), this);
TQWhatsThis::add(m_duplexbox, whatsThisGeneralDuplexLabel); TQWhatsThis::add(m_duplexbox, whatsThisGeneralDuplexLabel);
m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this);
TQWhatsThis::add(m_nupbox, whatsThisGeneralPagesPerSheetLabel); TQWhatsThis::add(m_nupbox, whatsThisGeneralPagesPerSheetLabel);
m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this); m_bannerbox = new TQGroupBox(0, TQt::Vertical, i18n("Banners"), this);
TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel); TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel);
TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
@ -305,19 +305,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
m_portrait->setChecked(true); m_portrait->setChecked(true);
m_orientpix = new TQLabel(m_orientbox); m_orientpix = new TQLabel(m_orientbox);
m_orientpix->setAlignment(Qt::AlignCenter); m_orientpix->setAlignment(TQt::AlignCenter);
TQRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); TQRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox);
TQRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); TQRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox);
TQRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); TQRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox);
m_dupnone->setChecked(true); m_dupnone->setChecked(true);
m_duplexpix = new TQLabel(m_duplexbox); m_duplexpix = new TQLabel(m_duplexbox);
m_duplexpix->setAlignment(Qt::AlignCenter); m_duplexpix->setAlignment(TQt::AlignCenter);
TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox);
TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox);
TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox);
m_nup1->setChecked(true); m_nup1->setChecked(true);
m_nuppix = new TQLabel(m_nupbox); m_nuppix = new TQLabel(m_nupbox);
m_nuppix->setAlignment(Qt::AlignCenter); m_nuppix->setAlignment(TQt::AlignCenter);
m_startbanner = new TQComboBox(m_bannerbox); m_startbanner = new TQComboBox(m_bannerbox);
m_endbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox);
TQLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); TQLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox);

@ -42,7 +42,7 @@ KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, cons
setTitle(i18n("Margins")); setTitle(i18n("Margins"));
m_usedriver = true; m_usedriver = true;
TQGroupBox *box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this); TQGroupBox *box = new TQGroupBox(1, TQt::Vertical, i18n("Margins"), this);
m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0)); m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0));
//m_margin->setSymetricMargins(true); //m_margin->setSymetricMargins(true);
//if (m_printer) //if (m_printer)

@ -116,11 +116,11 @@ void KPQtPage::init()
m_pagesize = new TQComboBox(this); m_pagesize = new TQComboBox(this);
TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel);
TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
m_pagesizelabel->setBuddy(m_pagesize); m_pagesizelabel->setBuddy(m_pagesize);
m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this);
TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel);
m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this); m_colorbox = new TQButtonGroup(0, TQt::Vertical, i18n("Color Mode"), this);
TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel); TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel);
TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel);
@ -129,7 +129,7 @@ void KPQtPage::init()
TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel);
m_orientpix = new TQLabel(m_orientbox); m_orientpix = new TQLabel(m_orientbox);
m_orientpix->setAlignment(Qt::AlignCenter); m_orientpix->setAlignment(TQt::AlignCenter);
TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel);
TQRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); TQRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox);
@ -137,10 +137,10 @@ void KPQtPage::init()
TQRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); TQRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox);
m_colorpix = new TQLabel(m_colorbox); m_colorpix = new TQLabel(m_colorbox);
m_colorpix->setAlignment(Qt::AlignCenter); m_colorpix->setAlignment(TQt::AlignCenter);
TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel);
m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this);
// TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel); // TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel);
TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox);
TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel);
@ -152,7 +152,7 @@ void KPQtPage::init()
TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel);
m_nuppix = new TQLabel(m_nupbox); m_nuppix = new TQLabel(m_nupbox);
m_nuppix->setAlignment(Qt::AlignCenter); m_nuppix->setAlignment(TQt::AlignCenter);
TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel);
// layout creation // layout creation

@ -262,7 +262,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
setCaption(i18n("Print")); setCaption(i18n("Print"));
// widget creation // widget creation
TQGroupBox *m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this); TQGroupBox *m_pbox = new TQGroupBox(0,TQt::Vertical,i18n("Printer"), this);
d->m_type = new TQLabel(m_pbox); d->m_type = new TQLabel(m_pbox);
TQWhatsThis::add(d->m_type, whatsThisPrinterType); TQWhatsThis::add(d->m_type, whatsThisPrinterType);
d->m_state = new TQLabel(m_pbox); d->m_state = new TQLabel(m_pbox);

@ -157,8 +157,8 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
else else
{ {
new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
} }
} }

@ -34,7 +34,7 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
setPageHeader(i18n("Spooler Settings")); setPageHeader(i18n("Spooler Settings"));
setPagePixmap("gear"); setPagePixmap("gear");
TQGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this); TQGroupBox *m_modebox = new TQGroupBox(1, TQt::Vertical, i18n("Spooler"), this);
m_mode = new TQComboBox(m_modebox); m_mode = new TQComboBox(m_modebox);
m_mode->insertItem("LPR (BSD compatible)"); m_mode->insertItem("LPR (BSD compatible)");

@ -74,7 +74,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p)
int w1 = (listBox()->contentsWidth()-m_pix.width())/2; int w1 = (listBox()->contentsWidth()-m_pix.width())/2;
p->drawPixmap(w1,5,m_pix); p->drawPixmap(w1,5,m_pix);
p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),Qt::AlignHCenter,text()); p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),TQt::AlignHCenter,text());
} }
//*********************************************************************************** //***********************************************************************************

@ -34,7 +34,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
setPageHeader(i18n("Command Settings")); setPageHeader(i18n("Command Settings"));
setPagePixmap("application-x-executable"); setPagePixmap("application-x-executable");
TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Edit/Create Commands"), this);
TQLabel *lab = new TQLabel(i18n( TQLabel *lab = new TQLabel(i18n(
"<p>Command objects perform a conversion from input to output.<br>" "<p>Command objects perform a conversion from input to output.<br>"
"They are used as the basis to build both print filters " "They are used as the basis to build both print filters "

@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
setPageHeader(i18n("Printer Filtering Settings")); setPageHeader(i18n("Printer Filtering Settings"));
setPagePixmap("filter"); setPagePixmap("filter");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Printer Filter"), this);
m_list1 = new TDEListBox(box); m_list1 = new TDEListBox(box);
m_list1->setSelectionMode(TDEListBox::Extended); m_list1->setSelectionMode(TDEListBox::Extended);

@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
setPageHeader(i18n("Font Settings")); setPageHeader(i18n("Font Settings"));
setPagePixmap("fonts"); setPagePixmap("fonts");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Embedding"), this);
TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); TQGroupBox *box2 = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Path"), this);
m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box);
m_fontpath = new TDEListView(box2); m_fontpath = new TDEListView(box2);

@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
setPageHeader(i18n("General Settings")); setPageHeader(i18n("General Settings"));
setPagePixmap("document-print"); setPagePixmap("document-print");
TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); TQGroupBox *m_timerbox = new TQGroupBox(0, TQt::Vertical, i18n("Refresh Interval"), this);
m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer = new KIntNumInput(m_timerbox,"Timer");
m_timer->setRange(0,30); m_timer->setRange(0,30);
m_timer->setSuffix( i18n( " sec" ) ); m_timer->setSuffix( i18n( " sec" ) );
@ -54,7 +54,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
"<b>TDE Print</b> components like the print manager " "<b>TDE Print</b> components like the print manager "
"and the job viewer.")); "and the job viewer."));
TQGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); TQGroupBox *m_testpagebox = new TQGroupBox(0, TQt::Vertical, i18n("Test Page"), this);
m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_testpage = new KURLRequester(m_testpagebox,"TestPage");
m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
@ -66,7 +66,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
m_preview->setDisabled(true); m_preview->setDisabled(true);
m_defaulttestpage->setCursor(KCursor::handCursor()); m_defaulttestpage->setCursor(KCursor::handCursor());
TQGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); TQGroupBox *m_statusbox = new TQGroupBox(0, TQt::Vertical, i18n("Miscellaneous"), this);
m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox);
m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox);

@ -34,7 +34,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
setPageHeader(i18n("Print Job Settings")); setPageHeader(i18n("Print Job Settings"));
setPagePixmap("application-x-executable"); setPagePixmap("application-x-executable");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Jobs Shown"), this);
m_limit = new KIntNumInput(box); m_limit = new KIntNumInput(box);
m_limit->setRange(0, 9999, 1, true); m_limit->setRange(0, 9999, 1, true);

@ -36,7 +36,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
setPageHeader(i18n("Preview Settings")); setPageHeader(i18n("Preview Settings"));
setPagePixmap("filefind"); setPagePixmap("filefind");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Preview Program"), this);
m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_useext = new TQCheckBox(i18n("&Use external preview program"), box);
m_program = new KURLRequester(box); m_program = new KURLRequester(box);

@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
{ {
m_title = new TQLabel(this); m_title = new TQLabel(this);
m_titlepixmap = new TQLabel(this); m_titlepixmap = new TQLabel(this);
m_titlepixmap->setAlignment(Qt::AlignCenter); m_titlepixmap->setAlignment(TQt::AlignCenter);
KSeparator* sep = new KSeparator( KSeparator::HLine, this); KSeparator* sep = new KSeparator( KSeparator::HLine, this);
m_type = new TQLabel(this); m_type = new TQLabel(this);
m_description = new TQLabel(this); m_description = new TQLabel(this);
@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
m_uri = new TQLabel(this); m_uri = new TQLabel(this);
m_device = new TQLabel(this); m_device = new TQLabel(this);
TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this);
m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_loclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this); TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this);
m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_desclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this);
m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_typelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this);
m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_statelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this); TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this);
m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_urilabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
m_devlabel = new TQLabel(i18n("Device:"), this); m_devlabel = new TQLabel(i18n("Device:"), this);
m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_devlabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this); TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this);
m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_modellabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5);
TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10);

@ -240,10 +240,10 @@ void KMJobViewer::init()
m_view->addColumn(i18n("Status", "State")); m_view->addColumn(i18n("Status", "State"));
m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Size (KB)"));
m_view->addColumn(i18n("Page(s)")); m_view->addColumn(i18n("Page(s)"));
m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter);
connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
//m_view->addColumn(i18n("Printer")); //m_view->addColumn(i18n("Printer"));
//m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter); //m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter);
KMFactory::self()->uiManager()->setupJobViewer(m_view); KMFactory::self()->uiManager()->setupJobViewer(m_view);
m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_view->setLineWidth(1); m_view->setLineWidth(1);
@ -263,7 +263,7 @@ void KMJobViewer::initActions()
// job actions // job actions
TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
mact->setDelayed(false); mact->setDelayed(false);

@ -148,7 +148,7 @@ void KMMainView::restoreSettings()
TDEConfig *conf = KMFactory::self()->printConfig(); TDEConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("General"); conf->setGroup("General");
setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons));
setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); setOrientation(conf->readNumEntry("Orientation", TQt::Vertical));
bool view = conf->readBoolEntry("ViewToolBar",false); bool view = conf->readBoolEntry("ViewToolBar",false);
slotToggleToolBar(view); slotToggleToolBar(view);
((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
@ -608,13 +608,13 @@ void KMMainView::slotSoftDefault()
void KMMainView::setOrientation(int o) void KMMainView::setOrientation(int o)
{ {
int ID = (o == Qt::Horizontal ? 1 : 0); int ID = (o == TQt::Horizontal ? 1 : 0);
((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
slotChangeDirection(ID); slotChangeDirection(ID);
} }
int KMMainView::orientation() const int KMMainView::orientation() const
{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } { return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? TQt::Horizontal : TQt::Vertical); }
void KMMainView::slotChangeDirection(int d) void KMMainView::slotChangeDirection(int d)
{ {

@ -44,7 +44,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
main_->setRowStretch(3,1); main_->setRowStretch(3,1);
main_->addWidget(l1,0,0); main_->addWidget(l1,0,0);
main_->addWidget(l2,1,0); main_->addWidget(l2,1,0);
main_->addWidget(l3,2,0,Qt::AlignTop|Qt::AlignLeft); main_->addWidget(l3,2,0,TQt::AlignTop|TQt::AlignLeft);
main_->addWidget(m_manufacturer,0,1); main_->addWidget(m_manufacturer,0,1);
main_->addWidget(m_model,1,1); main_->addWidget(m_model,1,1);
main_->addWidget(m_driverinfo,2,1); main_->addWidget(m_driverinfo,2,1);

@ -63,10 +63,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); KSeparator* sep = new KSeparator( KSeparator::HLine, dummy);
sep->setFixedHeight(10); sep->setFixedHeight(10);
TQGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); TQGroupBox *m_gb = new TQGroupBox(1, TQt::Horizontal, i18n("Command &Settings"), dummy);
m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this);
TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); TQGroupBox *m_outfile_gb = new TQGroupBox( 0, TQt::Horizontal, i18n( "Outp&ut File" ), dummy );
m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb); m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb);
@ -128,7 +128,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
l0->addLayout(TQT_TQLAYOUT(l1)); l0->addLayout(TQT_TQLAYOUT(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, Qt::AlignCenter); l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter);
l1->addWidget(m_namelabel, 0, 1); l1->addWidget(m_namelabel, 0, 1);
l1->addWidget(m_desclabel, 1, 1); l1->addWidget(m_desclabel, 1, 1);
l1->addWidget(m_loclabel, 2, 1); l1->addWidget(m_loclabel, 2, 1);

@ -72,7 +72,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
lay2->addColSpacing(1,10); lay2->addColSpacing(1,10);
lay2->addWidget(l1,0,0); lay2->addWidget(l1,0,0);
lay2->addWidget(l2,1,0); lay2->addWidget(l2,1,0);
lay2->addWidget(l3,2,0,Qt::AlignLeft|Qt::AlignTop); lay2->addWidget(l3,2,0,TQt::AlignLeft|TQt::AlignTop);
lay2->addWidget(m_manufacturer,0,2); lay2->addWidget(m_manufacturer,0,2);
lay2->addWidget(m_model,1,2); lay2->addWidget(m_model,1,2);
lay2->addWidget(m_driverinfo,2,2); lay2->addWidget(m_driverinfo,2,2);

@ -58,7 +58,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
mm->setFixedWidth(fontMetrics().width(mm->text())+10); mm->setFixedWidth(fontMetrics().width(mm->text())+10);
mask_ = new TQLineEdit(dummy); mask_ = new TQLineEdit(dummy);
mask_->setAlignment(Qt::AlignRight); mask_->setAlignment(TQt::AlignRight);
port_ = new TQComboBox(true,dummy); port_ = new TQComboBox(true,dummy);
if ( port_->lineEdit() ) if ( port_->lineEdit() )
port_->lineEdit()->setValidator( val ); port_->lineEdit()->setValidator( val );

@ -125,7 +125,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_commandlab->setBuddy(m_command); m_commandlab->setBuddy(m_command);
m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy );
TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Va&lues"), m_dummy);
m_stack = new TQWidgetStack(gb); m_stack = new TQWidgetStack(gb);
TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack);
m_stack->addWidget(w1, 1); m_stack->addWidget(w1, 1);
@ -159,8 +159,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy);
TQGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); TQGroupBox *gb_input = new TQGroupBox(0, TQt::Horizontal, i18n("&Input From"), this);
TQGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); TQGroupBox *gb_output = new TQGroupBox(0, TQt::Horizontal, i18n("O&utput To"), this);
TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input);
TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input);
TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output);
@ -201,16 +201,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l7->addStretch(1); l7->addStretch(1);
l0->addWidget(m_dummy, 1); l0->addWidget(m_dummy, 1);
TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint());
l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_desclab, 0, 0, TQt::AlignRight|TQt::AlignVCenter);
l1->addWidget(m_desc, 0, 1); l1->addWidget(m_desc, 0, 1);
l1->addMultiCellWidget(sep1, 1, 1, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1);
l1->addWidget(m_namelab, 2, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_namelab, 2, 0, TQt::AlignRight|TQt::AlignVCenter);
l1->addWidget(m_name, 2, 1); l1->addWidget(m_name, 2, 1);
l1->addWidget(m_typelab, 3, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_typelab, 3, 0, TQt::AlignRight|TQt::AlignVCenter);
l1->addWidget(m_type, 3, 1); l1->addWidget(m_type, 3, 1);
l1->addWidget(m_formatlab, 4, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_formatlab, 4, 0, TQt::AlignRight|TQt::AlignVCenter);
l1->addWidget(m_format, 4, 1); l1->addWidget(m_format, 4, 1);
l1->addWidget(m_defaultlab, 5, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_defaultlab, 5, 0, TQt::AlignRight|TQt::AlignVCenter);
l1->addWidget(m_default, 5, 1); l1->addWidget(m_default, 5, 1);
l1->addWidget( m_persistent, 6, 1 ); l1->addWidget( m_persistent, 6, 1 );
l1->addMultiCellWidget(gb, 7, 7, 0, 1); l1->addMultiCellWidget(gb, 7, 7, 0, 1);
@ -225,8 +225,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l6->addStretch(1); l6->addStretch(1);
TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint());
l5->setRowStretch(2, 1); l5->setRowStretch(2, 1);
l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter); l5->addWidget(m_editlab1, 0, 0, TQt::AlignRight|TQt::AlignVCenter);
l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter); l5->addWidget(m_editlab2, 1, 0, TQt::AlignRight|TQt::AlignVCenter);
l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit1, 0, 1);
l5->addWidget(m_edit2, 1, 1); l5->addWidget(m_edit2, 1, 1);
@ -836,8 +836,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
TQWidget *dummy = new TQWidget(this, "TopDetail"); TQWidget *dummy = new TQWidget(this, "TopDetail");
TQWidget *topmain = new TQWidget(this, "TopMain"); TQWidget *topmain = new TQWidget(this, "TopMain");
TQGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); TQGroupBox *m_gb1 = new TQGroupBox(0, TQt::Horizontal, i18n("Supported &Input Formats"), dummy);
TQGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); TQGroupBox *m_gb2 = new TQGroupBox(0, TQt::Horizontal, i18n("Requirements"), topmain);
m_description = new TQLineEdit(topmain); m_description = new TQLineEdit(topmain);
m_idname = new TQLabel(topmain); m_idname = new TQLabel(topmain);

@ -91,7 +91,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
l1->addWidget(m_line); l1->addWidget(m_line);
l1->addWidget(m_browse); l1->addWidget(m_browse);
KSeparator *sep = new KSeparator(Qt::Horizontal, this); KSeparator *sep = new KSeparator(TQt::Horizontal, this);
l0->addWidget(sep); l0->addWidget(sep);
} }
else else

@ -344,7 +344,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
mm->setFixedWidth(fontMetrics().width(mm->text())+10); mm->setFixedWidth(fontMetrics().width(mm->text())+10);
mask_ = new TQLineEdit(dummy); mask_ = new TQLineEdit(dummy);
mask_->setAlignment(Qt::AlignRight); mask_->setAlignment(TQt::AlignRight);
port_ = new TQComboBox(true,dummy); port_ = new TQComboBox(true,dummy);
if ( port_->lineEdit() ) if ( port_->lineEdit() )
port_->lineEdit()->setValidator( val ); port_->lineEdit()->setValidator( val );

@ -37,16 +37,16 @@
static void draw3DPage(TQPainter *p, TQRect r) static void draw3DPage(TQPainter *p, TQRect r)
{ {
// draw white page // draw white page
p->fillRect(r,Qt::white); p->fillRect(r,TQt::white);
// draw 3D border // draw 3D border
p->setPen(Qt::black); p->setPen(TQt::black);
p->moveTo(r.left(),r.bottom()); p->moveTo(r.left(),r.bottom());
p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.bottom());
p->lineTo(r.right(),r.top()); p->lineTo(r.right(),r.top());
p->setPen(Qt::darkGray); p->setPen(TQt::darkGray);
p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.top());
p->lineTo(r.left(),r.bottom()); p->lineTo(r.left(),r.bottom());
p->setPen(Qt::gray); p->setPen(TQt::gray);
p->moveTo(r.left()+1,r.bottom()-1); p->moveTo(r.left()+1,r.bottom()-1);
p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1);
p->lineTo(r.right()-1,r.top()+1); p->lineTo(r.right()-1,r.top()+1);
@ -189,7 +189,7 @@ void MarginPreview::mouseMoveEvent(TQMouseEvent *e)
if (nopreview_ || state_ == Fixed) if (nopreview_ || state_ == Fixed)
return; return;
int pos = locateMouse(e->pos()); int pos = locateMouse(e->pos());
if (state_ == None && e->button() == Qt::NoButton) if (state_ == None && e->button() == TQt::NoButton)
{ {
switch (pos) switch (pos)
{ {
@ -262,7 +262,7 @@ void MarginPreview::drawTempLine(TQPainter *p)
void MarginPreview::mousePressEvent(TQMouseEvent *e) void MarginPreview::mousePressEvent(TQMouseEvent *e)
{ {
if (e->button() != Qt::LeftButton || state_ != None) if (e->button() != TQt::LeftButton || state_ != None)
return; return;
int mpos = locateMouse(e->pos()); int mpos = locateMouse(e->pos());
if (mpos) if (mpos)

@ -155,10 +155,10 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
TQWhatsThis::add(m_left, whatsThisLeftMarginWidget); TQWhatsThis::add(m_left, whatsThisLeftMarginWidget);
m_right = new MarginValueWidget(m_left, 0.0, this); m_right = new MarginValueWidget(m_left, 0.0, this);
TQWhatsThis::add(m_right, whatsThisRightMarginWidget); TQWhatsThis::add(m_right, whatsThisRightMarginWidget);
m_top->setLabel(i18n("&Top:"), Qt::AlignLeft|Qt::AlignVCenter); m_top->setLabel(i18n("&Top:"), TQt::AlignLeft|TQt::AlignVCenter);
m_bottom->setLabel(i18n("&Bottom:"), Qt::AlignLeft|Qt::AlignVCenter); m_bottom->setLabel(i18n("&Bottom:"), TQt::AlignLeft|TQt::AlignVCenter);
m_left->setLabel(i18n("Le&ft:"), Qt::AlignLeft|Qt::AlignVCenter); m_left->setLabel(i18n("Le&ft:"), TQt::AlignLeft|TQt::AlignVCenter);
m_right->setLabel(i18n("&Right:"), Qt::AlignLeft|Qt::AlignVCenter); m_right->setLabel(i18n("&Right:"), TQt::AlignLeft|TQt::AlignVCenter);
m_units = new TQComboBox(this); m_units = new TQComboBox(this);
TQWhatsThis::add(m_units, whatsThisMeasurementUnitMarginWidget); TQWhatsThis::add(m_units, whatsThisMeasurementUnitMarginWidget);
m_units->insertItem(i18n("Pixels (1/72nd in)")); m_units->insertItem(i18n("Pixels (1/72nd in)"));

@ -144,9 +144,9 @@ void PosterPreview::drawContents( TQPainter *painter )
if ( pw > 0 && ph > 0 ) if ( pw > 0 && ph > 0 )
p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ), p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ),
( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
p->setPen( Qt::DotLine ); p->setPen( TQt::DotLine );
p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
p->setPen( Qt::SolidLine ); p->setPen( TQt::SolidLine );
pw -= m_pw-2*m_mw-px; pw -= m_pw-2*m_mw-px;
px = 0; px = 0;
@ -177,7 +177,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e )
void PosterPreview::mousePressEvent( TQMouseEvent *e ) void PosterPreview::mousePressEvent( TQMouseEvent *e )
{ {
if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() ) if ( e->button() == TQt::LeftButton && m_boundingrect.isValid() )
{ {
if ( m_boundingrect.contains( e->pos() ) ) if ( m_boundingrect.contains( e->pos() ) )
{ {

@ -29,7 +29,7 @@
#include <kcursor.h> #include <kcursor.h>
KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) : TQGroupBox(0, TQt::Vertical, i18n("Proxy Settings"), parent, name)
{ {
TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this);
TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), this); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), this);

@ -28,7 +28,7 @@ void drawColorWheel( TQPainter *p )
{ {
TQFont f( "times", 18, TQFont::Bold ); TQFont f( "times", 18, TQFont::Bold );
p->setFont( f ); p->setFont( f );
p->setPen( Qt::black ); p->setPen( TQt::black );
p->setWindow( 0, 0, 500, 500 ); // defines coordinate system p->setWindow( 0, 0, 500, 500 ); // defines coordinate system
for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles
@ -83,12 +83,12 @@ void drawFonts( TQPainter *p )
void drawShapes( TQPainter *p ) void drawShapes( TQPainter *p )
{ {
TQBrush b1( Qt::blue ); TQBrush b1( TQt::blue );
TQBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill TQBrush b2( TQt::green, TQt::Dense6Pattern ); // green 12% fill
TQBrush b3( Qt::NoBrush ); // void brush TQBrush b3( TQt::NoBrush ); // void brush
TQBrush b4( Qt::CrossPattern ); // black cross pattern TQBrush b4( TQt::CrossPattern ); // black cross pattern
p->setPen( Qt::red ); p->setPen( TQt::red );
p->setBrush( b1 ); p->setBrush( b1 );
p->drawRect( 10, 10, 200, 100 ); p->drawRect( 10, 10, 200, 100 );
p->setBrush( b2 ); p->setBrush( b2 );

@ -123,7 +123,7 @@ void TreeListBoxItem::paint(TQPainter *p)
p->drawPixmap(xo, yo, *pix); p->drawPixmap(xo, yo, *pix);
xo += (pix->width() + 2); xo += (pix->width() + 2);
} }
p->drawText(xo, 0, r.width()-xo, height(listBox()), Qt::AlignLeft, m_path[m_depth]); p->drawText(xo, 0, r.width()-xo, height(listBox()), TQt::AlignLeft, m_path[m_depth]);
} }
//----------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------

@ -46,7 +46,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() ); TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() );
TQGroupBox *generalGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); TQGroupBox *generalGroupBox = new TQGroupBox( 2, TQt::Horizontal, main );
generalGroupBox->layout()->setSpacing( spacingHint() ); generalGroupBox->layout()->setSpacing( spacingHint() );
generalGroupBox->setTitle( i18n( "General Settings" ) ); generalGroupBox->setTitle( i18n( "General Settings" ) );
@ -61,7 +61,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
mainLayout->addWidget( generalGroupBox ); mainLayout->addWidget( generalGroupBox );
TQGroupBox *resourceGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); TQGroupBox *resourceGroupBox = new TQGroupBox( 2, TQt::Horizontal, main );
resourceGroupBox->layout()->setSpacing( spacingHint() ); resourceGroupBox->layout()->setSpacing( spacingHint() );
resourceGroupBox->setTitle( i18n( "%1 Resource Settings" ) resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
.arg( factory->typeName( resource->type() ) ) ); .arg( factory->typeName( resource->type() ) ) );

@ -105,7 +105,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this ); TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this );
groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->setColumnLayout(0, TQt::Vertical );
groupBox->layout()->setSpacing( 6 ); groupBox->layout()->setSpacing( 6 );
groupBox->layout()->setMargin( 11 ); groupBox->layout()->setMargin( 11 );
TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 ); TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 );
@ -122,7 +122,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
groupBoxLayout->addWidget( mListView, 1, 0 ); groupBoxLayout->addWidget( mListView, 1, 0 );
connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) );
KButtonBox *buttonBox = new KButtonBox( groupBox, Qt::Vertical ); KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical );
mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) ); mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) );
mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) ); mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) );
mRemoveButton->setEnabled( false ); mRemoveButton->setEnabled( false );

@ -45,7 +45,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
mainLayout->setMargin( marginHint() ); mainLayout->setMargin( marginHint() );
TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this ); TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal, this );
groupBox->setTitle( i18n( "Resources" ) ); groupBox->setTitle( i18n( "Resources" ) );
mResourceId = new TDEListBox( groupBox ); mResourceId = new TDEListBox( groupBox );

@ -126,7 +126,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
layout->addWidget(mLabel); layout->addWidget(mLabel);
// Create an exclusive button group // Create an exclusive button group
TQButtonGroup *layoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); TQButtonGroup *layoutg = new TQButtonGroup( 1, TQt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
layout->addWidget( layoutg ); layout->addWidget( layoutg );
layoutg->setExclusive( TRUE ); layoutg->setExclusive( TRUE );
@ -146,7 +146,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
//(void)new TQRadioButton( "Ra&diobutton 3", layoutg ); //(void)new TQRadioButton( "Ra&diobutton 3", layoutg );
// Create an exclusive button group // Create an exclusive button group
TQButtonGroup *layoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); TQButtonGroup *layoutm = new TQButtonGroup( 1, TQt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
layout->addWidget( layoutm ); layout->addWidget( layoutm );
layoutg->setExclusive( TRUE ); layoutg->setExclusive( TRUE );
@ -156,7 +156,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
} }
// Create an exclusive button group // Create an exclusive button group
TQButtonGroup *layouta = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget); TQButtonGroup *layouta = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget);
layout->addWidget( layouta ); layout->addWidget( layouta );
layouta->setExclusive( FALSE ); layouta->setExclusive( FALSE );

@ -127,12 +127,12 @@ void Highlighter::setCurrentLanguage( const TQString& lang )
void Highlighter::setMisspelled( int start, int count ) void Highlighter::setMisspelled( int start, int count )
{ {
setFormat( start , count, Qt::red ); setFormat( start , count, TQt::red );
} }
void Highlighter::unsetMisspelled( int start, int count ) void Highlighter::unsetMisspelled( int start, int count )
{ {
setFormat( start, count, Qt::black ); setFormat( start, count, TQt::black );
} }
/* /*
@ -142,7 +142,7 @@ void Highlighter::checkWords()
if ( !w.end ) { if ( !w.end ) {
if ( !d->dict->check( w.word ) ) { if ( !d->dict->check( w.word ) ) {
setFormat( w.start, w.word.length(), setFormat( w.start, w.word.length(),
Qt::red ); TQt::red );
} }
} }
}*/ }*/

@ -907,7 +907,7 @@ void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
} }
} }
if (p->pen() == Qt::NoPen) { if (p->pen() == TQt::NoPen) {
p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light()); p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light());
} }
@ -1675,11 +1675,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
} else if (mi->pixmap()) { } else if (mi->pixmap()) {
TQPixmap *pixmap = mi->pixmap(); TQPixmap *pixmap = mi->pixmap();
if (pixmap->depth() == 1) { if (pixmap->depth() == 1) {
p->setBackgroundMode(Qt::OpaqueMode); p->setBackgroundMode(TQt::OpaqueMode);
} }
p->drawPixmap(xpos, y, *pixmap); p->drawPixmap(xpos, y, *pixmap);
if (pixmap->depth() == 1) { if (pixmap->depth() == 1) {
p->setBackgroundMode(Qt::TransparentMode); p->setBackgroundMode(TQt::TransparentMode);
} }
} }
} }
@ -1883,7 +1883,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
int i; int i;
for( i=0; i<64; i++ ) for( i=0; i<64; i++ )
a.setPoint( i, 0, i*2+1 ); a.setPoint( i, 0, i*2+1 );
p.setPen( Qt::color1 ); p.setPen( TQt::color1 );
p.drawPoints( a ); p.drawPoints( a );
p.end(); p.end();
TQApplication::flushX(); TQApplication::flushX();
@ -1891,7 +1891,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
p.begin( horizontalLine ); p.begin( horizontalLine );
for( i=0; i<64; i++ ) for( i=0; i<64; i++ )
a.setPoint( i, i*2+1, 0 ); a.setPoint( i, i*2+1, 0 );
p.setPen( Qt::color1 ); p.setPen( TQt::color1 );
p.drawPoints( a ); p.drawPoints( a );
p.end(); p.end();
TQApplication::flushX(); TQApplication::flushX();

@ -430,7 +430,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
if (p && p->device()->devType() == TQInternal::Widget) { if (p && p->device()->devType() == TQInternal::Widget) {
TQHeader* hdr = dynamic_cast<TQHeader*>(p->device()); TQHeader* hdr = dynamic_cast<TQHeader*>(p->device());
if (hdr) if (hdr)
horizontal = hdr->orientation() == Qt::Horizontal; horizontal = hdr->orientation() == TQt::Horizontal;
} }
int x,y,w,h; int x,y,w,h;
@ -730,7 +730,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
maskBmp.setMask(maskBmp); maskBmp.setMask(maskBmp);
} }
p->setPen(Qt::color1); p->setPen(TQt::color1);
p->drawPixmap(r.x(), r.y(), maskBmp); p->drawPixmap(r.x(), r.y(), maskBmp);
break; break;
} }
@ -1480,14 +1480,14 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
// Draw the pixmap // Draw the pixmap
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::OpaqueMode ); p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 ) int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 ); + ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::TransparentMode ); p->setBackgroundMode( TQt::TransparentMode );
} }
} }
@ -1689,7 +1689,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
TQRect pr = parent->rect(); TQRect pr = parent->rect();
renderGradient( p, r, cg.button(), renderGradient( p, r, cg.button(),
parent->orientation() == Qt::Vertical, parent->orientation() == TQt::Vertical,
r.x(), r.y(), pr.width()-2, pr.height()-2); r.x(), r.y(), pr.width()-2, pr.height()-2);
} }
else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget")) else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget"))
@ -1698,7 +1698,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
TQToolBar* toolbar = (TQToolBar*)parent->parent(); TQToolBar* toolbar = (TQToolBar*)parent->parent();
TQRect tr = toolbar->rect(); TQRect tr = toolbar->rect();
if ( toolbar->orientation() == Qt::Horizontal ) { if ( toolbar->orientation() == TQt::Horizontal ) {
renderGradient( p, r, cg.button(), false, r.x(), r.y(), renderGradient( p, r, cg.button(), false, r.x(), r.y(),
r.width(), tr.height() ); r.width(), tr.height() );
} else { } else {
@ -2048,7 +2048,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
// Check if the parent is a QToolbar, and use its orientation, else guess. // Check if the parent is a QToolbar, and use its orientation, else guess.
TQToolBar* tb = dynamic_cast<TQToolBar*>(parent); TQToolBar* tb = dynamic_cast<TQToolBar*>(parent);
if (tb) horiz_grad = tb->orientation() == Qt::Vertical; if (tb) horiz_grad = tb->orientation() == TQt::Vertical;
TQPainter p( widget ); TQPainter p( widget );
renderGradient(&p, r, parent->colorGroup().button(), horiz_grad, renderGradient(&p, r, parent->colorGroup().button(), horiz_grad,
@ -2071,11 +2071,11 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect;
TQPainter p( widget ); TQPainter p( widget );
renderGradient(&p, wr, toolbar->colorGroup().button(), renderGradient(&p, wr, toolbar->colorGroup().button(),
toolbar->orientation() == Qt::Vertical, toolbar->orientation() == TQt::Vertical,
wr.x(), wr.y(), tr.width() - 2, tr.height() - 2); wr.x(), wr.y(), tr.width() - 2, tr.height() - 2);
p.setPen( toolbar->colorGroup().dark() ); p.setPen( toolbar->colorGroup().dark() );
if ( toolbar->orientation() == Qt::Horizontal ) if ( toolbar->orientation() == TQt::Horizontal )
p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
else else
p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 );

@ -219,12 +219,12 @@ void HighContrastStyle::setColorsByState (TQPainter* p, const TQColorGroup& cg,
if ((flags & Style_Enabled) && (flags & highlight)) if ((flags & Style_Enabled) && (flags & highlight))
{ {
p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine));
p->setBackgroundColor (cg.highlight()); p->setBackgroundColor (cg.highlight());
} }
else else
{ {
p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine));
p->setBackgroundColor (bg); p->setBackgroundColor (bg);
} }
@ -253,7 +253,7 @@ void HighContrastStyle::drawRoundRect (TQPainter* p, TQRect r, int offset, bool
addOffset (&r3, lineWidth); addOffset (&r3, lineWidth);
p->save(); p->save();
p->setPen (Qt::NoPen); p->setPen (TQt::NoPen);
if (filled) if (filled)
p->fillRect (r3, p->backgroundColor()); p->fillRect (r3, p->backgroundColor());
p->drawRect (r3); p->drawRect (r3);
@ -371,9 +371,9 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
case PE_FocusRect: { case PE_FocusRect: {
p->save(); p->save();
p->setBrush (TQBrush ()); p->setBrush (TQBrush ());
p->setPen (TQPen (cg.highlight(), basicLineWidth, Qt::SolidLine)); p->setPen (TQPen (cg.highlight(), basicLineWidth, TQt::SolidLine));
drawRoundRect (p, r, basicLineWidth, false); drawRoundRect (p, r, basicLineWidth, false);
p->setPen (TQPen (cg.highlightedText(), basicLineWidth, Qt::DashLine)); p->setPen (TQPen (cg.highlightedText(), basicLineWidth, TQt::DashLine));
drawRoundRect (p, r, basicLineWidth, false); drawRoundRect (p, r, basicLineWidth, false);
p->restore(); p->restore();
break; break;
@ -472,7 +472,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
case PE_ProgressBarChunk: { case PE_ProgressBarChunk: {
p->fillRect (r, Qt::color1); p->fillRect (r, TQt::color1);
break; break;
} }
@ -506,7 +506,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
break; break;
} }
case PE_IndicatorMask: { case PE_IndicatorMask: {
p->fillRect (r, Qt::color1); p->fillRect (r, TQt::color1);
break; break;
} }
case PE_CheckMark: { case PE_CheckMark: {
@ -535,10 +535,10 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
break; break;
} }
case PE_ExclusiveIndicatorMask: { case PE_ExclusiveIndicatorMask: {
p->fillRect (r, Qt::color0); p->fillRect (r, TQt::color0);
p->setBackgroundColor (Qt::color1); p->setBackgroundColor (TQt::color1);
p->setPen (Qt::NoPen); p->setPen (TQt::NoPen);
p->setBrush (Qt::color1); p->setBrush (TQt::color1);
p->drawEllipse (r); p->drawEllipse (r);
break; break;
} }
@ -551,7 +551,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
setColorsButton (p, cg, flags); setColorsButton (p, cg, flags);
p->fillRect (r, p->backgroundColor()); p->fillRect (r, p->backgroundColor());
p->setPen (TQPen (p->pen().color(), 1, Qt::DashLine)); p->setPen (TQPen (p->pen().color(), 1, TQt::DashLine));
if (flags & Style_Horizontal) if (flags & Style_Horizontal)
p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom()); p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom());
else else
@ -713,7 +713,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
{ {
setColorsButton (p, cg); setColorsButton (p, cg);
p->fillRect (r, p->backgroundColor()); p->fillRect (r, p->backgroundColor());
p->setBrush (TQBrush (p->pen().color(), Qt::BDiagPattern)); p->setBrush (TQBrush (p->pen().color(), TQt::BDiagPattern));
drawRoundRect (p, r); drawRoundRect (p, r);
break; break;
} }
@ -1133,14 +1133,14 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
// Draw the pixmap // Draw the pixmap
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::OpaqueMode ); p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 ) int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 ); + ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::TransparentMode ); p->setBackgroundMode( TQt::TransparentMode );
} }
} }

@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
switch (stylepixmap) { switch (stylepixmap) {
case SP_TitleBarMinButton: case SP_TitleBarMinButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify, return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify,
Qt::black, Qt::black, false, false); TQt::black, TQt::black, false, false);
//return qpixmap_from_bits( iconify_bits, "title-iconify.png" ); //return qpixmap_from_bits( iconify_bits, "title-iconify.png" );
case SP_TitleBarMaxButton: case SP_TitleBarMaxButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize, return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize,
Qt::black, Qt::black, false, false); TQt::black, TQt::black, false, false);
case SP_TitleBarCloseButton: case SP_TitleBarCloseButton:
if (widget && widget->inherits("KDockWidgetHeader")) if (widget && widget->inherits("KDockWidgetHeader"))
return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny, return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny,
Qt::black, Qt::black, false, false); TQt::black, TQt::black, false, false);
else return Keramik::PixmapLoader::the().pixmap(keramik_title_close, else return Keramik::PixmapLoader::the().pixmap(keramik_title_close,
Qt::black, Qt::black, false, false); TQt::black, TQt::black, false, false);
case SP_TitleBarNormalButton: case SP_TitleBarNormalButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_restore, return Keramik::PixmapLoader::the().pixmap(keramik_title_restore,
Qt::black, Qt::black, false, false); TQt::black, TQt::black, false, false);
default: default:
break; break;
} }
@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
if (horizontal) if (horizontal)
Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl, Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl,
Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
else else
Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl, Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl,
Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
break; break;
} }
@ -1600,7 +1600,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
//toolbar we normally paint over. //toolbar we normally paint over.
} }
Keramik::GradientPainter::renderGradient( p, pr, cg.button(), Keramik::GradientPainter::renderGradient( p, pr, cg.button(),
tb->orientation() == Qt::Horizontal); tb->orientation() == TQt::Horizontal);
} }
else else
TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
@ -1818,14 +1818,14 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
// Draw the pixmap // Draw the pixmap
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::OpaqueMode ); p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 ) int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 ); + ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::TransparentMode ); p->setBackgroundMode( TQt::TransparentMode );
} }
} }
@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
p2->setPen( cg.buttonText() ); p2->setPen( cg.buttonText() );
p2->drawLineSegments( a ); p2->drawLineSegments( a );
Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
} }
else //Size-constrained combo -- loose the ripple. else //Size-constrained combo -- loose the ripple.
{ {
@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
p2->fillRect( er, cg.base() ); p2->fillRect( er, cg.base() );
drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg ); drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(), Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(),
Qt::black, false, pmodeFullBlend() ); TQt::black, false, pmodeFullBlend() );
} }
else if ( elementFlags & CEF_HasFocus ) else if ( elementFlags & CEF_HasFocus )
{ {
@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine )
{ {
TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget ); TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget );
if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal ) if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal )
{ {
if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine; if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine;
} }
@ -2813,7 +2813,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
TQPainter p( widget ); TQPainter p( widget );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), widget->palette().color( TQPalette::Normal, TQColorGroup::Button ),
Qt::black, false, Keramik::TilePainter::PaintFullBlend); TQt::black, false, Keramik::TilePainter::PaintFullBlend);
recursion = false; recursion = false;
return true; return true;
} }
@ -2936,7 +2936,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
TQRect wr = widget->rect (), tr = toolbar->rect(); TQRect wr = widget->rect (), tr = toolbar->rect();
TQPainter p( widget ); TQPainter p( widget );
if ( toolbar->orientation() == Qt::Horizontal ) if ( toolbar->orientation() == TQt::Horizontal )
{ {
Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
true /*horizontal*/, false /*not a menu*/, true /*horizontal*/, false /*not a menu*/,
@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
//Draw terminator line, too //Draw terminator line, too
p.setPen( toolbar->colorGroup().mid() ); p.setPen( toolbar->colorGroup().mid() );
if ( toolbar->orientation() == Qt::Horizontal ) if ( toolbar->orientation() == TQt::Horizontal )
p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
else else
p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 );

@ -316,7 +316,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
{ {
if (mode == PaintTrivialMask) if (mode == PaintTrivialMask)
{ {
p->fillRect(x, y, width, height, Qt::color1); p->fillRect(x, y, width, height, TQt::color1);
return; return;
} }
@ -425,12 +425,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask(); const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask();
if (mask) if (mask)
{ {
p->setBackgroundColor(Qt::color0); p->setBackgroundColor(TQt::color0);
p->setPen(Qt::color1); p->setPen(TQt::color1);
p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
} }
else else
p->fillRect ( xpos, ypos, realW, realH, Qt::color1); p->fillRect ( xpos, ypos, realW, realH, TQt::color1);
} }
} }
else else
@ -445,12 +445,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask(); const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask();
if (mask) if (mask)
{ {
p->setBackgroundColor(Qt::color0); p->setBackgroundColor(TQt::color0);
p->setPen(Qt::color1); p->setPen(TQt::color1);
p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
} }
else else
p->fillRect ( xpos, ypos, realW, realH, Qt::color1); p->fillRect ( xpos, ypos, realW, realH, TQt::color1);
} }
} }

@ -387,7 +387,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
// draw the image // draw the image
bool mask = image->hasAlphaBuffer(); bool mask = image->hasAlphaBuffer();
TQBitmap bm(width, height); TQBitmap bm(width, height);
bm.fill(Qt::color1); bm.fill(TQt::color1);
TQImage nimage[3][3]; TQImage nimage[3][3];
int xx = -1, yy = -1; int xx = -1, yy = -1;
@ -404,12 +404,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
if (nimage[yy][xx].isNull()) continue; if (nimage[yy][xx].isNull()) continue;
bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx], bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx],
0, 0, w2[xx], h2[yy], Qt::CopyROP); 0, 0, w2[xx], h2[yy], TQt::CopyROP);
if (mask) { if (mask) {
TQImage am = nimage[yy][xx].createAlphaMask(); TQImage am = nimage[yy][xx].createAlphaMask();
bitBlt(&bm, x2[xx], y2[yy], &am, bitBlt(&bm, x2[xx], y2[yy], &am,
0, 0, w2[xx], h2[yy], Qt::CopyROP); 0, 0, w2[xx], h2[yy], TQt::CopyROP);
} }
} }
} }
@ -419,14 +419,14 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
} else { } else {
for (int y = 0; y < height; y += image->height()) for (int y = 0; y < height; y += image->height())
for (int x = 0; x < width; x += image->width()) for (int x = 0; x < width; x += image->width())
bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP); bitBlt(pixmap, x, y, image, 0, 0, -1, -1, TQt::CopyROP);
if (image->hasAlphaBuffer()) { if (image->hasAlphaBuffer()) {
TQImage mask = image->createAlphaMask(); TQImage mask = image->createAlphaMask();
if (! mask.isNull() && mask.depth() == 1) { if (! mask.isNull() && mask.depth() == 1) {
TQBitmap bm(width, height); TQBitmap bm(width, height);
bm.fill(Qt::color1); bm.fill(TQt::color1);
bm = mask; bm = mask;
pixmap->setMask(bm); pixmap->setMask(bm);
} }
@ -1210,13 +1210,13 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (equals.isNull() || parameter.isNull() || equals != "=") continue;
if (parameter == "UP") if (parameter == "UP")
imagedata->key.data.arrowDirection = Qt::UpArrow + 1; imagedata->key.data.arrowDirection = TQt::UpArrow + 1;
else if (parameter == "DOWN") else if (parameter == "DOWN")
imagedata->key.data.arrowDirection = Qt::DownArrow + 1; imagedata->key.data.arrowDirection = TQt::DownArrow + 1;
else if (parameter == "LEFT") else if (parameter == "LEFT")
imagedata->key.data.arrowDirection = Qt::LeftArrow + 1; imagedata->key.data.arrowDirection = TQt::LeftArrow + 1;
else if (parameter == "RIGHT") else if (parameter == "RIGHT")
imagedata->key.data.arrowDirection = Qt::RightArrow + 1; imagedata->key.data.arrowDirection = TQt::RightArrow + 1;
} else if (next == "border") { } else if (next == "border") {
filestream >> equals; filestream >> equals;
filestream >> parameter; filestream >> parameter;
@ -1323,9 +1323,9 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (equals.isNull() || parameter.isNull() || equals != "=") continue;
if (parameter == "VERTICAL") if (parameter == "VERTICAL")
imagedata->key.data.orientation = Qt::Vertical + 1; imagedata->key.data.orientation = TQt::Vertical + 1;
else if (parameter == "HORIZONTAL") else if (parameter == "HORIZONTAL")
imagedata->key.data.orientation = Qt::Horizontal + 1; imagedata->key.data.orientation = TQt::Horizontal + 1;
} else if (next == "overlay_border") { } else if (next == "overlay_border") {
filestream >> equals; filestream >> equals;
filestream >> parameter; filestream >> parameter;

@ -1636,7 +1636,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
disfg = disfg.light( highlightVal ); disfg = disfg.light( highlightVal );
else else
// black fg - use darkgray disabled fg // black fg - use darkgray disabled fg
disfg = Qt::darkGray; disfg = TQt::darkGray;
TQColorGroup disabledgrp( disfg, background, //TODO:Convert this to the new ctor. TQColorGroup disabledgrp( disfg, background, //TODO:Convert this to the new ctor.

@ -550,9 +550,9 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
{ {
polishLock = true; polishLock = true;
TQColorGroup clrGroup( Qt::black, TQColor( 255, 255, 220 ), TQColorGroup clrGroup( TQt::black, TQColor( 255, 255, 220 ),
TQColor( 96, 96, 96 ), Qt::black, Qt::black, TQColor( 96, 96, 96 ), TQt::black, TQt::black,
Qt::black, TQColor( 255, 255, 220 ) ); TQt::black, TQColor( 255, 255, 220 ) );
TQPalette toolTip ( clrGroup, clrGroup, clrGroup ); TQPalette toolTip ( clrGroup, clrGroup, clrGroup );
TQToolTip::setPalette( toolTip ); TQToolTip::setPalette( toolTip );
@ -927,7 +927,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt
const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask(); const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask();
if ( mask ) if ( mask )
{ {
p->setPen( Qt::color1 ); p->setPen( TQt::color1 );
p->drawPixmap( x, y, *mask ); p->drawPixmap( x, y, *mask );
} }
else else
@ -945,7 +945,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt
IndicatorOff ) ->mask(); IndicatorOff ) ->mask();
if ( mask ) if ( mask )
{ {
p->setPen( Qt::color1 ); p->setPen( TQt::color1 );
p->drawPixmap( x, y, *mask ); p->drawPixmap( x, y, *mask );
} }
else else
@ -1686,14 +1686,14 @@ void KThemeStyle::drawControl( ControlElement element,
// Draw the pixmap // Draw the pixmap
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::OpaqueMode ); p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 ) int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 ); + ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x + diffw, y + itemFrame, *pixmap ); p->drawPixmap( x + diffw, y + itemFrame, *pixmap );
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::TransparentMode ); p->setBackgroundMode( TQt::TransparentMode );
} }
} }
@ -1851,7 +1851,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
if ( !roundSlider() ) if ( !roundSlider() )
{ {
const TQSlider * slider = ( const TQSlider* ) widget; const TQSlider * slider = ( const TQSlider* ) widget;
bool horizontal = slider->orientation() == Qt::Horizontal; bool horizontal = slider->orientation() == TQt::Horizontal;
if ( horizontal ) if ( horizontal )
{ {
drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true, drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true,
@ -1867,7 +1867,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
{ {
//This code is from HighColorDefault.. //This code is from HighColorDefault..
const TQSlider* slider = ( const TQSlider* ) widget; const TQSlider* slider = ( const TQSlider* ) widget;
bool horizontal = slider->orientation() == Qt::Horizontal; bool horizontal = slider->orientation() == TQt::Horizontal;
int gcenter = ( horizontal ? r.height() : r.width() ) / 2; int gcenter = ( horizontal ? r.height() : r.width() ) / 2;
TQRect gr; TQRect gr;
@ -1903,7 +1903,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
if ( isPixmap( Slider ) ) if ( isPixmap( Slider ) )
{ {
const TQSlider * slider = ( const TQSlider* ) widget; const TQSlider * slider = ( const TQSlider* ) widget;
bool horizontal = slider->orientation() == Qt::Horizontal; bool horizontal = slider->orientation() == TQt::Horizontal;
if ( horizontal ) if ( horizontal )
{ {
bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2, bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2,
@ -1928,7 +1928,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
//This code again from HighColor.. //This code again from HighColor..
//...except sans the gradient.. //...except sans the gradient..
const TQSlider* slider = ( const TQSlider* ) widget; const TQSlider* slider = ( const TQSlider* ) widget;
bool horizontal = slider->orientation() == Qt::Horizontal; bool horizontal = slider->orientation() == TQt::Horizontal;
int x, y, w, h; int x, y, w, h;
r.rect( &x, &y, &w, &h ); r.rect( &x, &y, &w, &h );
int x2 = x + w - 1; int x2 = x + w - 1;
@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p,
{ {
const TQScrollBar *sb = ( const TQScrollBar* ) widget; const TQScrollBar *sb = ( const TQScrollBar* ) widget;
bool maxedOut = ( sb->minValue() == sb->maxValue() ); bool maxedOut = ( sb->minValue() == sb->maxValue() );
bool horizontal = ( sb->orientation() == Qt::Horizontal ); bool horizontal = ( sb->orientation() == TQt::Horizontal );
SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) | SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) |
( maxedOut ? Style_Default : Style_Enabled ) ); ( maxedOut ? Style_Default : Style_Enabled ) );
@ -2374,7 +2374,7 @@ void KThemeStyle::drawShade( TQPainter *p, int x, int y, int w, int h,
++x, ++y; ++x, ++y;
--x2, --y2; --x2, --y2;
} }
p->setPen( Qt::black ); p->setPen( TQt::black );
p->drawPoints( bPntArray ); p->drawPoints( bPntArray );
p->drawLineSegments( bLineArray ); p->drawLineSegments( bLineArray );
p->setPen( highPen ); p->setPen( highPen );

@ -227,7 +227,7 @@ protected:
mutable TQPixmap* menuCache; mutable TQPixmap* menuCache;
mutable TQPixmap* vsliderCache; mutable TQPixmap* vsliderCache;
Qt::HANDLE brushHandle; TQt::HANDLE brushHandle;
bool brushHandleSet; bool brushHandleSet;
bool kickerMode; bool kickerMode;

@ -948,10 +948,10 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
} else if (mi->pixmap()) { } else if (mi->pixmap()) {
TQPixmap pixmap = *mi->pixmap(); TQPixmap pixmap = *mi->pixmap();
if (pixmap.depth() == 1) if (pixmap.depth() == 1)
p->setBackgroundMode(Qt::OpaqueMode); p->setBackgroundMode(TQt::OpaqueMode);
p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap);
if (pixmap.depth() == 1) if (pixmap.depth() == 1)
p->setBackgroundMode(Qt::TransparentMode); p->setBackgroundMode(TQt::TransparentMode);
} }
if (mi->popup()) if (mi->popup())

@ -1068,10 +1068,10 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
} else if (mi->pixmap()) { } else if (mi->pixmap()) {
TQPixmap pixmap = *mi->pixmap(); TQPixmap pixmap = *mi->pixmap();
if (pixmap.depth() == 1) if (pixmap.depth() == 1)
p->setBackgroundMode(Qt::OpaqueMode); p->setBackgroundMode(TQt::OpaqueMode);
p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap);
if (pixmap.depth() == 1) if (pixmap.depth() == 1)
p->setBackgroundMode(Qt::TransparentMode); p->setBackgroundMode(TQt::TransparentMode);
} }
if (mi->popup()) if (mi->popup())

@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
a.translate(0, 0); a.translate(0, 0);
} }
if (p->pen() == Qt::NoPen) { if (p->pen() == TQt::NoPen) {
if (flags & Style_Enabled) { if (flags & Style_Enabled) {
p->setPen(cg.buttonText()); p->setPen(cg.buttonText());
} else { } else {
@ -2682,14 +2682,14 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
// Draw the pixmap // Draw the pixmap
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::OpaqueMode ); p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( r.width() - pixmap->width() ) / 2 ) int diffw = ( ( r.width() - pixmap->width() ) / 2 )
+ ( ( r.width() - pixmap->width() ) % 2 ); + ( ( r.width() - pixmap->width() ) % 2 );
p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap ); p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap );
if ( pixmap->depth() == 1 ) if ( pixmap->depth() == 1 )
p->setBackgroundMode( Qt::TransparentMode ); p->setBackgroundMode( TQt::TransparentMode );
} }
} }

@ -60,7 +60,7 @@ static TQColor contrastingForeground(const TQColor & fg, const TQColor & bg)
if ((diff > -72) && (diff < 72)) if ((diff > -72) && (diff < 72))
{ {
return (vbg < 128) ? Qt::white : Qt::black; return (vbg < 128) ? TQt::white : TQt::black;
} }
else else
{ {
@ -471,8 +471,8 @@ WebStyle::drawScrollBarControls
p->setBrush(g.button()); p->setBrush(g.button());
p->drawRect(rAdd); p->drawRect(rAdd);
Qt::ArrowType t = TQt::ArrowType t =
sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow; sb->orientation() == Horizontal ? TQt::RightArrow : TQt::DownArrow;
// Is it me or is TDEStyle::drawArrow broken ? // Is it me or is TDEStyle::drawArrow broken ?
@ -500,8 +500,8 @@ WebStyle::drawScrollBarControls
p->setBrush(g.button()); p->setBrush(g.button());
p->drawRect(rSub); p->drawRect(rSub);
Qt::ArrowType t = TQt::ArrowType t =
sb->orientation() == Horizontal ? Qt::LeftArrow : Qt::UpArrow; sb->orientation() == Horizontal ? TQt::LeftArrow : TQt::UpArrow;
drawArrow drawArrow
( (
@ -785,7 +785,7 @@ WebStyle::drawIndicatorMask
int /* state */ int /* state */
) )
{ {
p->fillRect(x, y, w, h, Qt::color1); p->fillRect(x, y, w, h, TQt::color1);
} }
void void
@ -805,8 +805,8 @@ WebStyle::drawExclusiveIndicatorMask
if (0 == h % 2) if (0 == h % 2)
--h; --h;
p->setPen(Qt::color1); p->setPen(TQt::color1);
p->setBrush(Qt::color1); p->setBrush(TQt::color1);
p->drawEllipse(x, y, w, h); p->drawEllipse(x, y, w, h);
} }
@ -866,7 +866,7 @@ WebStyle::drawComboButton
p->drawPoint(w - 6, h - 10); p->drawPoint(w - 6, h - 10);
if (editable) if (editable)
p->fillRect(comboButtonFocusRect(x, y, w, h), Qt::red); p->fillRect(comboButtonFocusRect(x, y, w, h), TQt::red);
p->restore(); p->restore();
} }
@ -904,12 +904,12 @@ WebStyle::drawSliderGroove
{ {
p->save(); p->save();
p->setPen(TQPen(g.dark(), 0, Qt::DotLine)); p->setPen(TQPen(g.dark(), 0, TQt::DotLine));
if( o == Qt::Horizontal ) if( o == TQt::Horizontal )
p->drawLine(x, y + h / 2, w, y + h / 2); p->drawLine(x, y + h / 2, w, y + h / 2);
else else
if( o == Qt::Vertical ) if( o == TQt::Vertical )
p->drawLine(x + w / 2, y, x + w / 2, h); p->drawLine(x + w / 2, y, x + w / 2, h);
p->restore(); p->restore();
@ -919,7 +919,7 @@ WebStyle::drawSliderGroove
WebStyle::drawArrow WebStyle::drawArrow
( (
TQPainter * p, TQPainter * p,
Qt::ArrowType type, TQt::ArrowType type,
bool down, bool down,
int x, int x,
int y, int y,
@ -955,10 +955,10 @@ WebStyle::drawSlider
int sl = sliderLength(); int sl = sliderLength();
if( o == Qt::Horizontal ) if( o == TQt::Horizontal )
p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl); p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl);
else else
if( o == Qt::Vertical ) if( o == TQt::Vertical )
p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl); p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl);
p->restore(); p->restore();
@ -1495,7 +1495,7 @@ WebStyle::drawTabMask
bool bool
) )
{ {
p->fillRect(tab->rect(), Qt::color1); p->fillRect(tab->rect(), TQt::color1);
} }
void void
@ -1641,7 +1641,7 @@ WebStyle::drawKickerTaskButton
p->setPen(contrastingForeground(g.text(), bg)); p->setPen(contrastingForeground(g.text(), bg));
} }
p->setPen(Qt::white); p->setPen(TQt::white);
p->drawText p->drawText
( (
@ -1655,7 +1655,7 @@ WebStyle::drawKickerTaskButton
} }
p->restore(); p->restore();
p->setPen(Qt::white); p->setPen(TQt::white);
} }
int int

@ -186,7 +186,7 @@ class WebStyle : public TDEStyle
void drawArrow void drawArrow
( (
TQPainter *, TQPainter *,
Qt::ArrowType, TQt::ArrowType,
bool down, bool down,
int x, int x,
int y, int y,
@ -406,7 +406,7 @@ class WebStyle : public TDEStyle
int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &); int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &);
GUIStyle guiStyle() const { return Qt::MotifStyle; } GUIStyle guiStyle() const { return TQt::MotifStyle; }
bool eventFilter(TQObject *, TQEvent *); bool eventFilter(TQObject *, TQEvent *);
}; };

@ -140,7 +140,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e )
void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e )
{ {
if ( e->button() == Qt::LeftButton && if ( e->button() == TQt::LeftButton &&
rect().contains( e->pos() ) ) rect().contains( e->pos() ) )
emit clicked(); emit clicked();

@ -24,10 +24,10 @@
class KArrowButtonPrivate class KArrowButtonPrivate
{ {
public: public:
Qt::ArrowType arrow; TQt::ArrowType arrow;
}; };
KArrowButton::KArrowButton(TQWidget *parent, Qt::ArrowType arrow, KArrowButton::KArrowButton(TQWidget *parent, TQt::ArrowType arrow,
const char *name) const char *name)
: TQPushButton(parent, name) : TQPushButton(parent, name)
{ {
@ -45,14 +45,14 @@ TQSize KArrowButton::sizeHint() const
return TQSize( 12, 12 ); return TQSize( 12, 12 );
} }
void KArrowButton::setArrowType(Qt::ArrowType a) void KArrowButton::setArrowType(TQt::ArrowType a)
{ {
if (d->arrow != a) { if (d->arrow != a) {
d->arrow = a; d->arrow = a;
repaint(); repaint();
} }
} }
Qt::ArrowType KArrowButton::arrowType() const TQt::ArrowType KArrowButton::arrowType() const
{ {
return d->arrow; return d->arrow;
} }
@ -95,10 +95,10 @@ void KArrowButton::drawButton(TQPainter *p)
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
switch (d->arrow) switch (d->arrow)
{ {
case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break;
case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break;
case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break;
} }
int flags = TQStyle::Style_Enabled; int flags = TQStyle::Style_Enabled;
if ( isDown() ) if ( isDown() )

@ -48,7 +48,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
* @param arrow The direction the arrrow should be pointing in * @param arrow The direction the arrrow should be pointing in
* @param name An internal name for this widget * @param name An internal name for this widget
*/ */
KArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, KArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow,
const char *name = 0); const char *name = 0);
/** /**
@ -65,11 +65,11 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
* Returns the arrow type * Returns the arrow type
* @since 3.4 * @since 3.4
*/ */
Qt::ArrowType arrowType() const; TQt::ArrowType arrowType() const;
// hacks for moc braindamages with enums // hacks for moc braindamages with enums
int arrowTp() const { return (int) arrowType(); } int arrowTp() const { return (int) arrowType(); }
void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } void setArrowTp( int tp ) { setArrowType( (TQt::ArrowType) tp ); }
public slots: public slots:
/** /**
* Defines in what direction the arrow is pointing to. Will repaint the * Defines in what direction the arrow is pointing to. Will repaint the
@ -77,7 +77,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
* *
* @param a The direction this arrow should be pointing in * @param a The direction this arrow should be pointing in
*/ */
void setArrowType(Qt::ArrowType a); void setArrowType(TQt::ArrowType a);
protected: protected:
/** /**

@ -122,7 +122,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
parent ); parent );
connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, connect( m_configureEmail, TQT_SIGNAL( clicked() ), this,
TQT_SLOT( slotConfigureEmail() ) ); TQT_SLOT( slotConfigureEmail() ) );
glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (Qt::AlignmentFlags)(AlignTop|AlignRight) ); glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight );
// To // To
qwtstr = i18n( "The email address this bug report is sent to." ); qwtstr = i18n( "The email address this bug report is sent to." );

@ -183,7 +183,7 @@ void KButtonBox::layout() {
void KButtonBox::placeButtons() { void KButtonBox::placeButtons() {
if(data->orientation == Qt::Horizontal) { if(data->orientation == TQt::Horizontal) {
// calculate free size and stretches // calculate free size and stretches
int fs = width() - 2 * data->border; int fs = width() - 2 * data->border;
int stretch = 0; int stretch = 0;
@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const {
else else
s = bs; s = bs;
if(data->orientation == Qt::Horizontal) if(data->orientation == TQt::Horizontal)
dw += s.width(); dw += s.width();
else else
dw += s.height(); dw += s.height();
@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const {
++itr; ++itr;
} }
if(data->orientation == Qt::Horizontal) if(data->orientation == TQt::Horizontal)
return TQSize(dw, bs.height() + 2 * data->border); return TQSize(dw, bs.height() + 2 * data->border);
else else
return TQSize(bs.width() + 2 * data->border, dw); return TQSize(bs.width() + 2 * data->border, dw);
@ -344,7 +344,7 @@ TQSize KButtonBox::sizeHint() const {
TQSizePolicy KButtonBox::sizePolicy() const TQSizePolicy KButtonBox::sizePolicy() const
{ {
return data->orientation == Qt::Horizontal? return data->orientation == TQt::Horizontal?
TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) : TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) :
TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
} }

@ -51,7 +51,7 @@ public:
* addButton() are laid out from top to bottom, otherwise they * addButton() are laid out from top to bottom, otherwise they
* are laid out from left to right. * are laid out from left to right.
*/ */
KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal, KButtonBox(TQWidget *parent, Orientation _orientation = TQt::Horizontal,
int border = 0, int _autoborder = 6); int border = 0, int _autoborder = 6);
/** /**

@ -382,7 +382,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar );
lFont->resize( lFont->sizeHint() ); lFont->resize( lFont->sizeHint() );
lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lFont->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
lFont->setMaximumWidth( lFont->sizeHint().width() ); lFont->setMaximumWidth( lFont->sizeHint().width() );
fontCombo = new TQComboBox( true, bar ); fontCombo = new TQComboBox( true, bar );
@ -393,7 +393,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar );
lTable->resize( lTable->sizeHint() ); lTable->resize( lTable->sizeHint() );
lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lTable->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
lTable->setMaximumWidth( lTable->sizeHint().width() ); lTable->setMaximumWidth( lTable->sizeHint().width() );
tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar );
@ -403,7 +403,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar );
lUnicode->resize( lUnicode->sizeHint() ); lUnicode->resize( lUnicode->sizeHint() );
lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lUnicode->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() );
const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" );

@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e)
TQPoint pos; TQPoint pos;
switch ( e->type() ) { switch ( e->type() ) {
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
if (((TQMouseEvent*) e )->button() != Qt::RightButton ) if (((TQMouseEvent*) e )->button() != TQt::RightButton )
break; break;
if ( !showOnPress ) if ( !showOnPress )
return true; // eat event for safety return true; // eat event for safety
@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e)
pos = ((TQMouseEvent*) e )->globalPos(); pos = ((TQMouseEvent*) e )->globalPos();
break; break;
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) if ( showOnPress || ((TQMouseEvent*) e )->button() != TQt::RightButton )
break; break;
popup = menus[o]; popup = menus[o];
pos = ((TQMouseEvent*) e )->globalPos(); pos = ((TQMouseEvent*) e )->globalPos();

@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e)
void KColorButton::mouseMoveEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e)
{ {
if( (e->state() & Qt::LeftButton) && if( (e->state() & TQt::LeftButton) &&
(e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{ {
// Drag color object // Drag color object

@ -79,23 +79,23 @@ static void createStandardPalette()
int i = 0; int i = 0;
standardPalette[i++] = Qt::red; standardPalette[i++] = TQt::red;
standardPalette[i++] = Qt::green; standardPalette[i++] = TQt::green;
standardPalette[i++] = Qt::blue; standardPalette[i++] = TQt::blue;
standardPalette[i++] = Qt::cyan; standardPalette[i++] = TQt::cyan;
standardPalette[i++] = Qt::magenta; standardPalette[i++] = TQt::magenta;
standardPalette[i++] = Qt::yellow; standardPalette[i++] = TQt::yellow;
standardPalette[i++] = Qt::darkRed; standardPalette[i++] = TQt::darkRed;
standardPalette[i++] = Qt::darkGreen; standardPalette[i++] = TQt::darkGreen;
standardPalette[i++] = Qt::darkBlue; standardPalette[i++] = TQt::darkBlue;
standardPalette[i++] = Qt::darkCyan; standardPalette[i++] = TQt::darkCyan;
standardPalette[i++] = Qt::darkMagenta; standardPalette[i++] = TQt::darkMagenta;
standardPalette[i++] = Qt::darkYellow; standardPalette[i++] = TQt::darkYellow;
standardPalette[i++] = Qt::white; standardPalette[i++] = TQt::white;
standardPalette[i++] = Qt::lightGray; standardPalette[i++] = TQt::lightGray;
standardPalette[i++] = Qt::gray; standardPalette[i++] = TQt::gray;
standardPalette[i++] = Qt::darkGray; standardPalette[i++] = TQt::darkGray;
standardPalette[i++] = Qt::black; standardPalette[i++] = TQt::black;
} }
#endif #endif

@ -191,23 +191,23 @@ static void createStandardPalette()
int i = 0; int i = 0;
standardPalette[i++] = Qt::red; standardPalette[i++] = TQt::red;
standardPalette[i++] = Qt::green; standardPalette[i++] = TQt::green;
standardPalette[i++] = Qt::blue; standardPalette[i++] = TQt::blue;
standardPalette[i++] = Qt::cyan; standardPalette[i++] = TQt::cyan;
standardPalette[i++] = Qt::magenta; standardPalette[i++] = TQt::magenta;
standardPalette[i++] = Qt::yellow; standardPalette[i++] = TQt::yellow;
standardPalette[i++] = Qt::darkRed; standardPalette[i++] = TQt::darkRed;
standardPalette[i++] = Qt::darkGreen; standardPalette[i++] = TQt::darkGreen;
standardPalette[i++] = Qt::darkBlue; standardPalette[i++] = TQt::darkBlue;
standardPalette[i++] = Qt::darkCyan; standardPalette[i++] = TQt::darkCyan;
standardPalette[i++] = Qt::darkMagenta; standardPalette[i++] = TQt::darkMagenta;
standardPalette[i++] = Qt::darkYellow; standardPalette[i++] = TQt::darkYellow;
standardPalette[i++] = Qt::white; standardPalette[i++] = TQt::white;
standardPalette[i++] = Qt::lightGray; standardPalette[i++] = TQt::lightGray;
standardPalette[i++] = Qt::gray; standardPalette[i++] = TQt::gray;
standardPalette[i++] = Qt::darkGray; standardPalette[i++] = TQt::darkGray;
standardPalette[i++] = Qt::black; standardPalette[i++] = TQt::black;
} }
@ -263,7 +263,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
KValueSelector::KValueSelector( TQWidget *parent, const char *name ) KValueSelector::KValueSelector( TQWidget *parent, const char *name )
: TDESelector( Qt::Vertical, parent, name ), _hue(0), _sat(0) : TDESelector( TQt::Vertical, parent, name ), _hue(0), _sat(0)
{ {
setRange( 0, 255 ); setRange( 0, 255 );
pixmap.setOptimization( TQPixmap::BestOptim ); pixmap.setOptimization( TQPixmap::BestOptim );
@ -300,7 +300,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap )
uint *p; uint *p;
TQRgb rgb; TQRgb rgb;
if ( orientation() == Qt::Horizontal ) if ( orientation() == TQt::Horizontal )
{ {
for ( int v = 0; v < ySize; v++ ) for ( int v = 0; v < ySize; v++ )
{ {
@ -315,7 +315,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap )
} }
} }
if( orientation() == Qt::Vertical ) if( orientation() == TQt::Vertical )
{ {
for ( int v = 0; v < ySize; v++ ) for ( int v = 0; v < ySize; v++ )
{ {
@ -429,7 +429,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders)
void KColorCells::mouseMoveEvent( TQMouseEvent *e ) void KColorCells::mouseMoveEvent( TQMouseEvent *e )
{ {
if( !(e->state() & Qt::LeftButton)) return; if( !(e->state() & TQt::LeftButton)) return;
if(inMouse) { if(inMouse) {
int delay = TDEGlobalSettings::dndEventDelay(); int delay = TDEGlobalSettings::dndEventDelay();
@ -533,7 +533,7 @@ void KColorPatch::drawContents( TQPainter *painter )
void KColorPatch::mouseMoveEvent( TQMouseEvent *e ) void KColorPatch::mouseMoveEvent( TQMouseEvent *e )
{ {
// Drag color object // Drag color object
if( !(e->state() & Qt::LeftButton)) return; if( !(e->state() & TQt::LeftButton)) return;
KColorDrag *d = new KColorDrag( color, this); KColorDrag *d = new KColorDrag( color, this);
d->dragCopy(); d->dragCopy();
} }
@ -1131,28 +1131,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
label = new TQLabel( page ); label = new TQLabel( page );
label->setText(i18n("Name:")); label->setText(i18n("Name:"));
l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft); l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, TQt::AlignLeft);
d->colorName = new TQLabel( page ); d->colorName = new TQLabel( page );
l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft); l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, TQt::AlignLeft);
label = new TQLabel( page ); label = new TQLabel( page );
label->setText(i18n("HTML:")); label->setText(i18n("HTML:"));
l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::AlignLeft); l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, TQt::AlignLeft);
d->htmlName = new KLineEdit( page ); d->htmlName = new KLineEdit( page );
d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
d->htmlName->setFixedWidth(w); d->htmlName->setFixedWidth(w);
l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft); l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, TQt::AlignLeft);
connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ),
TQT_SLOT( slotHtmlChanged() ) ); TQT_SLOT( slotHtmlChanged() ) );
d->patch = new KColorPatch( page ); d->patch = new KColorPatch( page );
d->patch->setFixedSize(48, 48); d->patch->setFixedSize(48, 48);
l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter);
connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)),
TQT_SLOT( setColor( const TQColor&))); TQT_SLOT( setColor( const TQColor&)));

@ -141,7 +141,7 @@ class KURL;
* // Tell the widget not to handle completion and rotation * // Tell the widget not to handle completion and rotation
* combo->setHandleSignals( false ); * combo->setHandleSignals( false );
* // Set your own completion key for manual completions. * // Set your own completion key for manual completions.
* combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); * combo->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End );
* // Hide the context (popup) menu * // Hide the context (popup) menu
* combo->setContextMenuEnabled( false ); * combo->setContextMenuEnabled( false );
* \endcode * \endcode

@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor()
TQWidget* w = actualWidget(); TQWidget* w = actualWidget();
if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already if ( w->cursor().shape() != TQt::BlankCursor ) // someone messed with the cursor already
return; return;
if ( m_isOwnCursor ) if ( m_isOwnCursor )

@ -225,8 +225,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e )
if ( (k->key() == TQt::Key_Prior) || if ( (k->key() == TQt::Key_Prior) ||
(k->key() == TQt::Key_Next) || (k->key() == TQt::Key_Next) ||
(k->key() == Qt::Key_Up) || (k->key() == TQt::Key_Up) ||
(k->key() == Qt::Key_Down) ) (k->key() == TQt::Key_Down) )
{ {
TQApplication::sendEvent( table, e ); TQApplication::sendEvent( table, e );
table->setFocus(); table->setFocus();

@ -497,7 +497,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e)
emit tableClicked(); emit tableClicked();
if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) if ( e->button() == TQt::RightButton && d->popupMenuEnabled )
{ {
TDEPopupMenu *menu = new TDEPopupMenu(); TDEPopupMenu *menu = new TDEPopupMenu();
menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) );
@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col)
void void
KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
{ {
if(!isEnabled() || e->button() != Qt::LeftButton) if(!isEnabled() || e->button() != TQt::LeftButton)
{ {
KNotifyClient::beep(); KNotifyClient::beep();
return; return;
@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
void void
KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
{ {
if (e->state() & Qt::LeftButton) if (e->state() & TQt::LeftButton)
{ {
int row, col; int row, col;
TQPoint mouseCoord; TQPoint mouseCoord;

@ -326,7 +326,7 @@ void KDialog::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ } { /*BASE::virtual_hook( id, data );*/ }
KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent)
: TQWidget( parent, "", Qt::WDestructiveClose ) : TQWidget( parent, "", TQt::WDestructiveClose )
{ {
TQVBoxLayout* vbox = new TQVBoxLayout( this ); TQVBoxLayout* vbox = new TQVBoxLayout( this );
@ -375,7 +375,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent)
TQWidget* swidget = new TQWidget( frame ); TQWidget* swidget = new TQWidget( frame );
swidget->resize(2, frame->sizeHint().width()); swidget->resize(2, frame->sizeHint().width());
swidget->setBackgroundColor(Qt::black); swidget->setBackgroundColor(TQt::black);
seperatorbox->addWidget( swidget, AlignCenter ); seperatorbox->addWidget( swidget, AlignCenter );
TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame ); TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame );
@ -396,7 +396,7 @@ KSMModalDialogHeader::~KSMModalDialogHeader()
} }
KSMModalDialog::KSMModalDialog(TQWidget* parent) KSMModalDialog::KSMModalDialog(TQWidget* parent)
: TQWidget( 0, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WType_Dialog | Qt::WStyle_Title | Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) : TQWidget( 0, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WType_Dialog | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false)
{ {
// Signal that we do not want any window controls to be shown at all // Signal that we do not want any window controls to be shown at all

@ -104,7 +104,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal,
:KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
mIsActivated(false), mShowTile(false), mMessageBoxMode(false), mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
{ {
setCaption( caption ); setCaption( caption );
@ -126,7 +126,7 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption,
:KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
mIsActivated(false), mShowTile(false), mMessageBoxMode(false), mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
{ {
setCaption( caption ); setCaption( caption );
@ -155,7 +155,7 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge
:KDialog( parent, name, modal, f ), :KDialog( parent, name, modal, f ),
mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
mIsActivated(false), mShowTile(false), mMessageBoxMode(false), mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
{ {
setCaption( caption ); setCaption( caption );
@ -183,7 +183,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask,
:KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
mIsActivated(false), mShowTile(false), mMessageBoxMode(true), mIsActivated(false), mShowTile(false), mMessageBoxMode(true),
mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton), mButtonOrientation(TQt::Horizontal),mEscapeButton(escapeButton),
d(new KDialogBasePrivate) d(new KDialogBasePrivate)
{ {
setCaption( caption ); setCaption( caption );
@ -235,7 +235,7 @@ void SButton::resize( bool sameWidth, int margin,
if( s.width() > w ) { w = s.width(); } if( s.width() > w ) { w = s.width(); }
} }
if( orientation == Qt::Horizontal ) if( orientation == TQt::Horizontal )
{ {
for( p = list.first(); p; p = list.next() ) for( p = list.first(); p; p = list.next() )
{ {
@ -299,7 +299,7 @@ void KDialogBase::setupLayout()
// mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() ); // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() );
if( mButtonOrientation == Qt::Horizontal ) if( mButtonOrientation == TQt::Horizontal )
{ {
mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom, mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom,
marginHint(), spacingHint() ); marginHint(), spacingHint() );
@ -349,10 +349,10 @@ void KDialogBase::setButtonBoxOrientation( int orientation )
mButtonOrientation = orientation; mButtonOrientation = orientation;
if( mActionSep ) if( mActionSep )
{ {
mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ?
TQFrame::HLine : TQFrame::VLine ); TQFrame::HLine : TQFrame::VLine );
} }
if( mButtonOrientation == Qt::Vertical ) if( mButtonOrientation == TQt::Vertical )
{ {
enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet. enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet.
} }
@ -396,7 +396,7 @@ void KDialogBase::enableButtonSeparator( bool state )
} }
mActionSep = new KSeparator( this ); mActionSep = new KSeparator( this );
mActionSep->setFocusPolicy(TQWidget::NoFocus); mActionSep->setFocusPolicy(TQWidget::NoFocus);
mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ?
TQFrame::HLine : TQFrame::VLine ); TQFrame::HLine : TQFrame::VLine );
mActionSep->show(); mActionSep->show();
} }
@ -506,7 +506,7 @@ TQSize KDialogBase::minimumSizeHint() const
if( d->mButton.box ) if( d->mButton.box )
{ {
s2 = d->mButton.box->minimumSize(); s2 = d->mButton.box->minimumSize();
if( mButtonOrientation == Qt::Horizontal ) if( mButtonOrientation == TQt::Horizontal )
{ {
s1.rwidth() = TQMAX( s1.rwidth(), s2.rwidth() ); s1.rwidth() = TQMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight(); s1.rheight() += s2.rheight();
@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style )
layoutMax = 6; layoutMax = 6;
layout = layoutRule[ d->mButton.style ]; layout = layoutRule[ d->mButton.style ];
} }
else if (mButtonOrientation == Qt::Horizontal) else if (mButtonOrientation == TQt::Horizontal)
{ {
static const unsigned int layoutRule[5][10] = static const unsigned int layoutRule[5][10] =
{ {
@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style )
} }
TQBoxLayout *lay; TQBoxLayout *lay;
if( mButtonOrientation == Qt::Horizontal ) if( mButtonOrientation == TQt::Horizontal )
{ {
lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0, lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0,
spacingHint()); spacingHint());

@ -575,9 +575,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* toplevel widget for this particular page. The widget contains a * toplevel widget for this particular page. The widget contains a
* TQGridLayout layout so the widget children are positioned in a grid. * TQGridLayout layout so the widget children are positioned in a grid.
* *
* @param n Specifies the number of columns if @p dir is Qt::Horizontal * @param n Specifies the number of columns if @p dir is TQt::Horizontal
* or the number of rows if @p dir is Qt::Vertical. * or the number of rows if @p dir is TQt::Vertical.
* @param dir Can be Qt::Horizontal or Qt::Vertical. * @param dir Can be TQt::Horizontal or TQt::Vertical.
* @param itemName String used in the list or as tab item name. * @param itemName String used in the list or as tab item name.
* @param header Header text use in the list modes @p Ignored in @p Tabbed * @param header Header text use in the list modes @p Ignored in @p Tabbed
* mode. If empty, the item text is used instead. * mode. If empty, the item text is used instead.
@ -673,9 +673,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* constructor where you define the face (Plain, Swallow, Tabbed, * constructor where you define the face (Plain, Swallow, Tabbed,
* TreeList, IconList). * TreeList, IconList).
* *
* @param n Specifies the number of columns if 'dir' is Qt::Horizontal * @param n Specifies the number of columns if 'dir' is TQt::Horizontal
* or the number of rows if 'dir' is Qt::Vertical. * or the number of rows if 'dir' is TQt::Vertical.
* @param dir Can be Qt::Horizontal or Qt::Vertical. * @param dir Can be TQt::Horizontal or TQt::Vertical.
* *
* @return The main widget or 0 if any of the rules described above * @return The main widget or 0 if any of the rules described above
* were broken. * were broken.

@ -921,7 +921,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
{ {
if (!parent()) return 0; if (!parent()) return 0;
if (!parent()->inherits("KDockSplitter")) return 0; if (!parent()->inherits("KDockSplitter")) return 0;
Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal; Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? TQt::Vertical:TQt::Horizontal;
if (((KDockSplitter*)(parent()))->orientation()==orientation) if (((KDockSplitter*)(parent()))->orientation()==orientation)
{ {
KDockWidget *neighbor= KDockWidget *neighbor=
@ -1161,8 +1161,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
// if to dock not to the center of the target dockwidget, // if to dock not to the center of the target dockwidget,
// dock to newDock // dock to newDock
KDockSplitter* panner = 0L; KDockSplitter* panner = 0L;
if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Horizontal, spliPos ); if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Horizontal, spliPos );
if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Vertical , spliPos ); if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Vertical , spliPos );
newDock->setWidget( panner ); newDock->setWidget( panner );
panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setOpaqueResize(manager->splitterOpaqueResize());
@ -1347,13 +1347,13 @@ void KDockWidget::undock()
split->deactivate(); split->deactivate();
if ( split->getFirst() == parentOfTab ){ if ( split->getFirst() == parentOfTab ){
split->activate( lastTab ); split->activate( lastTab );
if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical )
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
else else
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
} else { } else {
split->activate( 0L, lastTab ); split->activate( 0L, lastTab );
if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical )
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
else else
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
@ -1719,7 +1719,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
break; break;
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( curdw->eDocking != (int)KDockWidget::DockNone ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){
dropCancel = true; dropCancel = true;
curdw->setFocus(); curdw->setFocus();
@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
} }
break; break;
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
if ( dragging ){ if ( dragging ){
if ( !dropCancel ) if ( !dropCancel )
drop(); drop();
@ -1822,7 +1822,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
if (d->readyToDrag) { if (d->readyToDrag) {
d->readyToDrag = false; d->readyToDrag = false;
} }
if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) &&
(curdw->eDocking != (int)KDockWidget::DockNone) ) { (curdw->eDocking != (int)KDockWidget::DockNone) ) {
startDrag( curdw); startDrag( curdw);
} }
@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base)
KDockWidget *second = getDockWidgetFromName(secondName); KDockWidget *second = getDockWidgetFromName(secondName);
if (first && second) { if (first && second) {
obj = first->manualDock(second, obj = first->manualDock(second,
(orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
separatorPos); separatorPos);
if (obj) if (obj)
obj->setName(name.latin1()); obj->setName(name.latin1());
@ -2758,7 +2758,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" ); Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" );
if ( first && last ){ if ( first && last ){
obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); obj = first->manualDock( last, ( p == TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
if (obj){ if (obj){
obj->setName( oname.latin1() ); obj->setName( oname.latin1() );
} }

@ -448,7 +448,7 @@ public:
* @param parent Parent widget * @param parent Parent widget
* @param strCaption Title of the dockwidget window (shown when toplevel) * @param strCaption Title of the dockwidget window (shown when toplevel)
* @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
* @param f Qt::WidgetFlags widget flags * @param f TQt::WidgetFlags widget flags
*/ */
KDockWidget( KDockManager* dockManager, const char* name, KDockWidget( KDockManager* dockManager, const char* name,
const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
@ -1330,7 +1330,7 @@ public:
* *
* @param parent Parent widget for the dock main widget * @param parent Parent widget for the dock main widget
* @param name internal object name * @param name internal object name
* @param f Qt::WidgetFlags widget flags * @param f TQt::WidgetFlags widget flags
*/ */
#ifdef qdoc #ifdef qdoc
KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );

@ -61,7 +61,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1)
divider->setLineWidth(1); divider->setLineWidth(1);
divider->raise(); divider->raise();
if (m_orientation == Qt::Horizontal) if (m_orientation == TQt::Horizontal)
divider->setCursor(TQCursor(tqsizeVerCursor)); divider->setCursor(TQCursor(tqsizeVerCursor));
else else
divider->setCursor(TQCursor(tqsizeHorCursor)); divider->setCursor(TQCursor(tqsizeHorCursor));
@ -173,7 +173,7 @@ void KDockSplitter::setupMinMaxSize()
{ {
// Set the minimum and maximum sizes for the KDockSplitter (this) // Set the minimum and maximum sizes for the KDockSplitter (this)
int minx, maxx, miny, maxy; int minx, maxx, miny, maxy;
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
miny = child0->minimumHeight() + child1->minimumHeight() + 4; miny = child0->minimumHeight() + child1->minimumHeight() + 4;
maxy = child0->maximumHeight() + child1->maximumHeight() + 4; maxy = child0->maximumHeight() + child1->maximumHeight() + 4;
minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth(); minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth();
@ -266,13 +266,13 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
// //
if (ev && isVisible() && divider->isVisible()) { if (ev && isVisible() && divider->isVisible()) {
// real resize event. // real resize event.
// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; // kdDebug(282)<<"mKeepSize : "<< ((m_orientation == TQt::Horizontal) ? "Horizontal":"Vertical") <<endl;
if (mKeepSize) { if (mKeepSize) {
// keep the splitter on a fixed position. This may be a bit inaccurate, because // keep the splitter on a fixed position. This may be a bit inaccurate, because
// xpos saves a proportional value, which means there might occur rounding errors. // xpos saves a proportional value, which means there might occur rounding errors.
// However, this works surprising well! // However, this works surprising well!
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
if (ev->oldSize().height() != ev->size().height()) { if (ev->oldSize().height() != ev->size().height()) {
if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
// dockwidget is on the bottom. move xpos so that the size from child1 stays // dockwidget is on the bottom. move xpos so that the size from child1 stays
@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
// values. // values.
// //
if ( isVisible()) { if ( isVisible()) {
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
if (fixedHeight0!=-1) if (fixedHeight0!=-1)
xpos = checkValue(fixedHeight0) * factor / height(); xpos = checkValue(fixedHeight0) * factor / height();
else if (fixedHeight1!=-1) else if (fixedHeight1!=-1)
@ -327,7 +327,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
/* /*
// --- debugging information --- // --- debugging information ---
kdDebug(282) << "isVisible() is : " << isVisible() << endl; kdDebug(282) << "isVisible() is : " << isVisible() << endl;
kdDebug(282) << "Orientation : " << (m_orientation==Qt::Horizontal?"Horizontal":"Vertical") kdDebug(282) << "Orientation : " << (m_orientation==TQt::Horizontal?"Horizontal":"Vertical")
<< endl; << endl;
kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;; kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;;
kdDebug(282) << "Splitter procentual pos: " << xpos << endl; kdDebug(282) << "Splitter procentual pos: " << xpos << endl;
@ -346,8 +346,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
// //
// handle overlapped widgets only. // handle overlapped widgets only.
// //
if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || if( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget())) if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget()))
&& (dc->isOverlapMode())) { && (dc->isOverlapMode())) {
// child0 ist a KDockContainer // child0 ist a KDockContainer
@ -355,7 +355,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
child0->show(); child0->show();
child0->raise(); child0->raise();
divider->raise(); divider->raise();
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
position = checkValueOverlapped( height() * xpos / factor, child0 ); position = checkValueOverlapped( height() * xpos / factor, child0 );
child0->setGeometry(0, 0, width(), position); child0->setGeometry(0, 0, width(), position);
child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize); child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize);
@ -374,7 +374,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
child1->show(); child1->show();
child1->raise(); child1->raise();
divider->raise(); divider->raise();
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
position = checkValueOverlapped( height() * xpos / factor, child1 ); position = checkValueOverlapped( height() * xpos / factor, child1 );
child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize); child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize);
child1->setGeometry(0, position+4, width(), height()-position-4); child1->setGeometry(0, position+4, width(), height()-position-4);
@ -399,10 +399,10 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
// the child0 and child1 adjoin. // the child0 and child1 adjoin.
// //
if (stdHandling) { if (stdHandling) {
int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor ); int position = checkValue( (m_orientation == TQt::Vertical ? width() : height()) * xpos / factor );
int diff = 0; int diff = 0;
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
// bottom is dockcontainer // bottom is dockcontainer
if( divider->isVisible() ) { if( divider->isVisible() ) {
@ -442,7 +442,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const
{ {
if (initialised) { if (initialised) {
if (m_orientation == Qt::Vertical) { if (m_orientation == TQt::Vertical) {
if (child0==overlappingWidget) { if (child0==overlappingWidget) {
if (position < child0->minimumWidth() || position > width()) if (position < child0->minimumWidth() || position > width())
position = child0->minimumWidth(); position = child0->minimumWidth();
@ -450,7 +450,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
if (position > (width()-child1->minimumWidth()-4) || position < 0) if (position > (width()-child1->minimumWidth()-4) || position < 0)
position = width()-child1->minimumWidth()-4; position = width()-child1->minimumWidth()-4;
} }
} else {// orientation == Qt::Horizontal } else {// orientation == TQt::Horizontal
if (child0==overlappingWidget) { if (child0==overlappingWidget) {
if (position < (child0->minimumHeight()) || position > height()) if (position < (child0->minimumHeight()) || position > height())
position = child0->minimumHeight(); position = child0->minimumHeight();
@ -466,7 +466,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
int KDockSplitter::checkValue( int position ) const int KDockSplitter::checkValue( int position ) const
{ {
if (initialised) { if (initialised) {
if (m_orientation == Qt::Vertical) { if (m_orientation == TQt::Vertical) {
if (position < child0->minimumWidth()) if (position < child0->minimumWidth())
position = child0->minimumWidth(); position = child0->minimumWidth();
if ((width()-4-position) < (child1->minimumWidth())) if ((width()-4-position) < (child1->minimumWidth()))
@ -481,9 +481,9 @@ int KDockSplitter::checkValue( int position ) const
if (position < 0) position = 0; if (position < 0) position = 0;
if ((m_orientation == Qt::Vertical) && (position > width())) if ((m_orientation == TQt::Vertical) && (position > width()))
position = width(); position = width();
if ((m_orientation == Qt::Horizontal) && (position > height())) if ((m_orientation == TQt::Horizontal) && (position > height()))
position = height(); position = height();
return position; return position;
@ -499,7 +499,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
mev= (TQMouseEvent*)e; mev= (TQMouseEvent*)e;
child0->setUpdatesEnabled(mOpaqueResize); child0->setUpdatesEnabled(mOpaqueResize);
child1->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize);
if (m_orientation == Qt::Horizontal) { if (m_orientation == TQt::Horizontal) {
if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{ {
handled=true; break; handled=true; break;
@ -539,7 +539,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
child0->setUpdatesEnabled(true); child0->setUpdatesEnabled(true);
child1->setUpdatesEnabled(true); child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e; mev= (TQMouseEvent*)e;
if (m_orientation == Qt::Horizontal){ if (m_orientation == TQt::Horizontal){
if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{ {
handled=true; break; handled=true; break;

@ -56,7 +56,7 @@ public:
* @param orient orientation. Either @p Vertical or @p Horizontal * @param orient orientation. Either @p Vertical or @p Horizontal
* @param pos procentual position of the splitter. Must be int [0...100]. * @param pos procentual position of the splitter. Must be int [0...100].
*/ */
KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50); KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= TQt::Vertical, int pos= 50);
virtual ~KDockSplitter(){} virtual ~KDockSplitter(){}
/** /**

@ -46,8 +46,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget*
(const unsigned char *)dcolorarrow_bits, true); (const unsigned char *)dcolorarrow_bits, true);
arrowBitmap->setMask(*arrowBitmap); // heh arrowBitmap->setMask(*arrowBitmap); // heh
resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); resetPixmap = new TQPixmap((const char **)dcolorreset_xpm);
fg = TQBrush(Qt::black, Qt::SolidPattern); fg = TQBrush(TQt::black, TQt::SolidPattern);
bg = TQBrush(Qt::white, Qt::SolidPattern); bg = TQBrush(TQt::white, TQt::SolidPattern);
curColor = Foreground; curColor = Foreground;
dragFlag = false; dragFlag = false;
miniCtlFlag = false; miniCtlFlag = false;
@ -67,8 +67,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo
(const unsigned char *)dcolorarrow_bits, true); (const unsigned char *)dcolorarrow_bits, true);
arrowBitmap->setMask(*arrowBitmap); arrowBitmap->setMask(*arrowBitmap);
resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); resetPixmap = new TQPixmap((const char **)dcolorreset_xpm);
fg = TQBrush(fgColor, Qt::SolidPattern); fg = TQBrush(fgColor, TQt::SolidPattern);
bg = TQBrush(bgColor, Qt::SolidPattern); bg = TQBrush(bgColor, TQt::SolidPattern);
curColor = Foreground; curColor = Foreground;
dragFlag = false; dragFlag = false;
miniCtlFlag = false; miniCtlFlag = false;
@ -111,7 +111,7 @@ TQSize KDualColorButton::sizeHint() const
void KDualColorButton::setForeground(const TQColor &c) void KDualColorButton::setForeground(const TQColor &c)
{ {
fg = TQBrush(c, Qt::SolidPattern); fg = TQBrush(c, TQt::SolidPattern);
repaint(false); repaint(false);
emit fgChanged(fg.color()); emit fgChanged(fg.color());
@ -119,7 +119,7 @@ void KDualColorButton::setForeground(const TQColor &c)
void KDualColorButton::setBackground(const TQColor &c) void KDualColorButton::setBackground(const TQColor &c)
{ {
bg = TQBrush(c, Qt::SolidPattern); bg = TQBrush(c, TQt::SolidPattern);
repaint(false); repaint(false);
emit bgChanged(bg.color()); emit bgChanged(bg.color());
@ -128,9 +128,9 @@ void KDualColorButton::setBackground(const TQColor &c)
void KDualColorButton::setCurrentColor(const TQColor &c) void KDualColorButton::setCurrentColor(const TQColor &c)
{ {
if(curColor == Background) if(curColor == Background)
bg = TQBrush(c, Qt::SolidPattern); bg = TQBrush(c, TQt::SolidPattern);
else else
fg = TQBrush(c, Qt::SolidPattern); fg = TQBrush(c, TQt::SolidPattern);
repaint(false); repaint(false);
} }
@ -211,8 +211,8 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
miniCtlFlag = true; miniCtlFlag = true;
} }
else if(ev->pos().x() < bgRect.x()){ else if(ev->pos().x() < bgRect.x()){
fg.setColor(Qt::black); fg.setColor(TQt::black);
bg.setColor(Qt::white); bg.setColor(TQt::white);
emit fgChanged(fg.color()); emit fgChanged(fg.color());
emit bgChanged(bg.color()); emit bgChanged(bg.color());
miniCtlFlag = true; miniCtlFlag = true;

@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
{ {
setWFlags( WType_TopLevel ); setWFlags( WType_TopLevel );
setButtonBoxOrientation( Qt::Vertical ); setButtonBoxOrientation( TQt::Vertical );
TQFrame *page = makeMainWidget(); TQFrame *page = makeMainWidget();
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );

@ -310,7 +310,7 @@ void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
TQIconViewItem* item = findItem( e->pos() ); TQIconViewItem* item = findItem( e->pos() );
if( item ) { if( item ) {
if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) if( (e->button() == TQt::LeftButton) && !m_bUseSingle )
emitExecute( item, e->globalPos() ); emitExecute( item, e->globalPos() );
emit doubleClicked( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() );
@ -324,7 +324,7 @@ void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const T
if( d->doubleClickIgnoreTimer.isActive() ) if( d->doubleClickIgnoreTimer.isActive() )
return; // Ignore double click return; // Ignore double click
if( (btn == Qt::LeftButton) && item ) if( (btn == TQt::LeftButton) && item )
emitExecute( item, pos ); emitExecute( item, pos );
} }
@ -388,7 +388,7 @@ void TDEIconView::cancelPendingHeldSignal()
void TDEIconView::wheelEvent( TQWheelEvent *e ) void TDEIconView::wheelEvent( TQWheelEvent *e )
{ {
if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) { if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) {
TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal); TQWheelEvent ce(e->pos(), e->delta(), e->state(), TQt::Horizontal);
TQApplication::sendEvent( horizontalScrollBar(), &ce); TQApplication::sendEvent( horizontalScrollBar(), &ce);
if (ce.isAccepted()) { if (ce.isAccepted()) {
e->accept(); e->accept();
@ -757,7 +757,7 @@ void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
p->setPen( TQPen( cg.highlightedText() ) ); p->setPen( TQPen( cg.highlightedText() ) );
} }
else { else {
if ( iconView()->itemTextBackground() != Qt::NoBrush ) { if ( iconView()->itemTextBackground() != TQt::NoBrush ) {
p->fillRect( textRect( false ), iconView()->itemTextBackground() ); p->fillRect( textRect( false ), iconView()->itemTextBackground() );
} }
p->setPen( cg.text() ); p->setPen( cg.text() );

@ -1110,14 +1110,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
pix = new TQPixmap( 32, 32 ); pix = new TQPixmap( 32, 32 );
TQPainter p( pix ); TQPainter p( pix );
p.eraseRect( 0, 0, pix->width(), pix->height() ); p.eraseRect( 0, 0, pix->width(), pix->height() );
p.setPen( Qt::red ); p.setPen( TQt::red );
p.drawRect ( 0, 0, pix->width(), pix->height() ); p.drawRect ( 0, 0, pix->width(), pix->height() );
p.end(); p.end();
TQBitmap mask( pix->width(), pix->height(), true ); TQBitmap mask( pix->width(), pix->height(), true );
mask.fill( Qt::black ); mask.fill( TQt::black );
p.begin( &mask ); p.begin( &mask );
p.setPen( Qt::white ); p.setPen( TQt::white );
p.drawRect ( 0, 0, pix->width(), pix->height() ); p.drawRect ( 0, 0, pix->width(), pix->height() );
p.end(); p.end();
@ -1149,14 +1149,14 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
void KJanusWidget::IconListItem::paintContents( TQPainter *painter ) void KJanusWidget::IconListItem::paintContents( TQPainter *painter )
{ {
TQFontMetrics fm = painter->fontMetrics(); TQFontMetrics fm = painter->fontMetrics();
int ht = fm.boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); int ht = fm.boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height();
int wp = mPixmap.width(); int wp = mPixmap.width();
int hp = mPixmap.height(); int hp = mPixmap.height();
painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap ); painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap );
if( !text().isEmpty() ) if( !text().isEmpty() )
{ {
painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, Qt::AlignCenter, text() ); painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, TQt::AlignCenter, text() );
} }
} }
@ -1168,7 +1168,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const
} }
else else
{ {
int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height();
return (mPixmap.height() + ht + 10); return (mPixmap.height() + ht + 10);
} }
} }
@ -1176,7 +1176,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const
int KJanusWidget::IconListItem::width( const TQListBox *lb ) const int KJanusWidget::IconListItem::width( const TQListBox *lb ) const
{ {
int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10; int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).width() + 10;
int wp = mPixmap.width() + 10; int wp = mPixmap.width() + 10;
int w = TQMAX( wt, wp ); int w = TQMAX( wt, wp );
return TQMAX( w, mMinimumWidth ); return TQMAX( w, mMinimumWidth );

@ -225,7 +225,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
// Set the brush to SolidPattern, this fills the entire area // Set the brush to SolidPattern, this fills the entire area
// of the ellipse which is drawn with a thin gray "border" (pen) // of the ellipse which is drawn with a thin gray "border" (pen)
brush.setStyle( Qt::SolidPattern ); brush.setStyle( TQt::SolidPattern );
brush.setColor( color ); brush.setColor( color );
pen.setWidth( scale ); pen.setWidth( scale );
@ -280,7 +280,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
// Set the brush to SolidPattern, this fills the entire area // Set the brush to SolidPattern, this fills the entire area
// of the ellipse which is drawn first // of the ellipse which is drawn first
brush.setStyle( Qt::SolidPattern ); brush.setStyle( TQt::SolidPattern );
brush.setColor( color ); brush.setColor( color );
paint.setBrush( brush ); // Assign the brush to the painter paint.setBrush( brush ); // Assign the brush to the painter
@ -328,7 +328,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
color = colorGroup().dark(); color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing paint.setPen( pen ); // Select pen for drawing
brush.setStyle( Qt::NoBrush ); // Switch off the brush brush.setStyle( TQt::NoBrush ); // Switch off the brush
paint.setBrush( brush ); // This avoids filling of the ellipse paint.setBrush( brush ); // This avoids filling of the ellipse
paint.drawEllipse( 2, 2, width, width ); paint.drawEllipse( 2, 2, width, width );
@ -376,7 +376,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
// Set the brush to SolidPattern, this fills the entire area // Set the brush to SolidPattern, this fills the entire area
// of the ellipse which is drawn first // of the ellipse which is drawn first
brush.setStyle( Qt::SolidPattern ); brush.setStyle( TQt::SolidPattern );
brush.setColor( color ); brush.setColor( color );
paint.setBrush( brush ); // Assign the brush to the painter paint.setBrush( brush ); // Assign the brush to the painter
@ -421,7 +421,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
// from the upper left. // from the upper left.
pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs? pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs?
brush.setStyle( (Qt::BrushStyle)NoBrush ); // Switch off the brush brush.setStyle( (TQt::BrushStyle)NoBrush ); // Switch off the brush
paint.setBrush( brush ); // This avoids filling of the ellipse paint.setBrush( brush ); // This avoids filling of the ellipse
// Set the initial color value to colorGroup().light() (bright) and start // Set the initial color value to colorGroup().light() (bright) and start
@ -494,8 +494,8 @@ KLed::paintRectFrame(bool raised)
TQBrush darkBrush(d->offcolor); TQBrush darkBrush(d->offcolor);
int w=width(); int w=width();
int h=height(); int h=height();
TQColor black=Qt::black; TQColor black=TQt::black;
TQColor white=Qt::white; TQColor white=TQt::white;
// ----- // -----
if(raised) if(raised)
{ {

@ -526,7 +526,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
{ {
KeyBindingMap keys = getKeyBindings(); KeyBindingMap keys = getKeyBindings();
TDEGlobalSettings::Completion mode = completionMode(); TDEGlobalSettings::Completion mode = completionMode();
bool noModifier = (e->state() == Qt::NoButton || bool noModifier = (e->state() == TQt::NoButton ||
e->state() == TQt::ShiftButton || e->state() == TQt::ShiftButton ||
e->state() == TQt::Keypad); e->state() == TQt::Keypad);
@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
{ {
if ( !d->userSelection && hasSelectedText() && if ( !d->userSelection && hasSelectedText() &&
( e->key() == Key_Right || e->key() == Key_Left ) && ( e->key() == Key_Right || e->key() == Key_Left ) &&
e->state()== Qt::NoButton ) e->state()== TQt::NoButton )
{ {
TQString old_txt = text(); TQString old_txt = text();
d->disableRestoreSelection = true; d->disableRestoreSelection = true;
@ -817,7 +817,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
possibleTripleClick=true; possibleTripleClick=true;
TQTimer::singleShot( TQApplication::doubleClickInterval(),this, TQTimer::singleShot( TQApplication::doubleClickInterval(),this,
@ -828,7 +828,7 @@ void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e )
void KLineEdit::mousePressEvent( TQMouseEvent* e ) void KLineEdit::mousePressEvent( TQMouseEvent* e )
{ {
if ( possibleTripleClick && e->button() == Qt::LeftButton ) if ( possibleTripleClick && e->button() == TQt::LeftButton )
{ {
selectAll(); selectAll();
e->accept(); e->accept();
@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e )
{ {
TQLineEdit::mouseReleaseEvent( e ); TQLineEdit::mouseReleaseEvent( e );
if (TQApplication::clipboard()->supportsSelection() ) { if (TQApplication::clipboard()->supportsSelection() ) {
if ( e->button() == Qt::LeftButton ) { if ( e->button() == TQt::LeftButton ) {
// Fix copying of squeezed text if needed // Fix copying of squeezed text if needed
copySqueezedText( false ); copySqueezedText( false );
} }
@ -1022,12 +1022,12 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
{ {
TQKeyEvent *e = TQT_TQKEYEVENT( ev ); TQKeyEvent *e = TQT_TQKEYEVENT( ev );
if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) if( e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter )
{ {
bool trap = d->completionBox && d->completionBox->isVisible(); bool trap = d->completionBox && d->completionBox->isVisible();
bool stopEvent = trap || (d->grabReturnKeyEvents && bool stopEvent = trap || (d->grabReturnKeyEvents &&
(e->state() == Qt::NoButton || (e->state() == TQt::NoButton ||
e->state() == TQt::Keypad)); e->state() == TQt::Keypad));
// Qt will emit returnPressed() itself if we return false // Qt will emit returnPressed() itself if we return false
@ -1180,7 +1180,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
int key = e->key(); int key = e->key();
ButtonState state = e->state(); ButtonState state = e->state();
if ((key == Key_Backtab || key == Key_Tab) && if ((key == Key_Backtab || key == Key_Tab) &&
(state == Qt::NoButton || (state & TQt::ShiftButton))) (state == TQt::NoButton || (state & TQt::ShiftButton)))
{ {
return true; return true;
} }

@ -127,7 +127,7 @@ class KURL;
* edit->setHandleSignals( false ); * edit->setHandleSignals( false );
* *
* // Set your own key-bindings for a text completion mode. * // Set your own key-bindings for a text completion mode.
* edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); * edit->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End );
* *
* // Hide the context (popup) menu * // Hide the context (popup) menu
* edit->setContextMenuEnabled( false ); * edit->setContextMenuEnabled( false );

@ -344,7 +344,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
m_slider->setRange(lower, upper); m_slider->setRange(lower, upper);
else { else {
m_slider = new TQSlider(lower, upper, step, m_spin->value(), m_slider = new TQSlider(lower, upper, step, m_spin->value(),
Qt::Horizontal, this); TQt::Horizontal, this);
m_slider->setTickmarks(TQSlider::Below); m_slider->setTickmarks(TQSlider::Below);
connect(m_slider, TQT_SIGNAL(valueChanged(int)), connect(m_slider, TQT_SIGNAL(valueChanged(int)),
m_spin, TQT_SLOT(setValue(int))); m_spin, TQT_SLOT(setValue(int)));
@ -771,7 +771,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
m_slider->setValue(slvalue); m_slider->setValue(slvalue);
} else { } else {
m_slider = new TQSlider(slmin, slmax, slstep, slvalue, m_slider = new TQSlider(slmin, slmax, slstep, slvalue,
Qt::Horizontal, this); TQt::Horizontal, this);
m_slider->setTickmarks(TQSlider::Below); m_slider->setTickmarks(TQSlider::Below);
// feedback line: when one moves, the other moves, too: // feedback line: when one moves, the other moves, too:
connect(m_slider, TQT_SIGNAL(valueChanged(int)), connect(m_slider, TQT_SIGNAL(valueChanged(int)),
@ -1011,7 +1011,7 @@ public:
KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name )
: TQSpinBox( parent, name ) : TQSpinBox( parent, name )
{ {
editor()->setAlignment( Qt::AlignRight ); editor()->setAlignment( TQt::AlignRight );
d = new Private(); d = new Private();
updateValidator(); updateValidator();
connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) );
@ -1022,7 +1022,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
TQWidget * parent, const char * name ) TQWidget * parent, const char * name )
: TQSpinBox( parent, name ) : TQSpinBox( parent, name )
{ {
editor()->setAlignment( Qt::AlignRight ); editor()->setAlignment( TQt::AlignRight );
d = new Private(); d = new Private();
setRange( lower, upper, step, precision ); setRange( lower, upper, step, precision );
setValue( value ); setValue( value );

@ -94,12 +94,12 @@ void KPanelApplet::positionChange( Position )
popupDirectionChange( popupDirection() ); popupDirectionChange( popupDirection() );
} }
Qt::Orientation KPanelApplet::orientation() const TQt::Orientation KPanelApplet::orientation() const
{ {
if( _position == pTop || _position == pBottom ) { if( _position == pTop || _position == pBottom ) {
return Qt::Horizontal; return TQt::Horizontal;
} else { } else {
return Qt::Vertical; return TQt::Vertical;
} }
} }

@ -98,12 +98,12 @@ void KPanelExtension::action( Action a )
reportBug(); reportBug();
} }
Qt::Orientation KPanelExtension::orientation() TQt::Orientation KPanelExtension::orientation()
{ {
if (_position == Left || _position == Right) if (_position == Left || _position == Right)
return Qt::Vertical; return TQt::Vertical;
else else
return Qt::Horizontal; return TQt::Horizontal;
} }
KPanelExtension::Size KPanelExtension::sizeSetting() const KPanelExtension::Size KPanelExtension::sizeSetting() const

@ -230,12 +230,12 @@ void KPasswordDialog::init()
lbl->setPixmap(pix); lbl->setPixmap(pix);
lbl->setAlignment(AlignHCenter|AlignVCenter); lbl->setAlignment(AlignHCenter|AlignVCenter);
lbl->setFixedSize(lbl->sizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 0, 0, (Qt::AlignmentFlags)AlignCenter); m_pGrid->addWidget(lbl, 0, 0, TQt::AlignCenter);
} }
m_pHelpLbl = new TQLabel(m_pMain); m_pHelpLbl = new TQLabel(m_pMain);
m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak);
m_pGrid->addWidget(m_pHelpLbl, 0, 2, (Qt::AlignmentFlags)AlignLeft); m_pGrid->addWidget(m_pHelpLbl, 0, 2, TQt::AlignLeft);
m_pGrid->addRowSpacing(1, 10); m_pGrid->addRowSpacing(1, 10);
m_pGrid->setRowStretch(1, 12); m_pGrid->setRowStretch(1, 12);
@ -248,7 +248,7 @@ void KPasswordDialog::init()
lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setAlignment(AlignLeft|AlignVCenter);
lbl->setText(i18n("&Password:")); lbl->setText(i18n("&Password:"));
lbl->setFixedSize(lbl->sizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 7, 0, (Qt::AlignmentFlags)AlignLeft); m_pGrid->addWidget(lbl, 7, 0, TQt::AlignLeft);
TQHBoxLayout *h_lay = new TQHBoxLayout(); TQHBoxLayout *h_lay = new TQHBoxLayout();
m_pGrid->addLayout(h_lay, 7, 2); m_pGrid->addLayout(h_lay, 7, 2);
@ -278,8 +278,8 @@ void KPasswordDialog::init()
m_keepWarnLbl->hide(); m_keepWarnLbl->hide();
} }
connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool)));
m_pGrid->addWidget(cb, 9, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter)); m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter);
// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter)); // m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter);
m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3);
} else if (m_Type == NewPassword) { } else if (m_Type == NewPassword) {
m_pGrid->addRowSpacing(8, 10); m_pGrid->addRowSpacing(8, 10);
@ -287,7 +287,7 @@ void KPasswordDialog::init()
lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setAlignment(AlignLeft|AlignVCenter);
lbl->setText(i18n("&Verify:")); lbl->setText(i18n("&Verify:"));
lbl->setFixedSize(lbl->sizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 9, 0, (Qt::AlignmentFlags)AlignLeft); m_pGrid->addWidget(lbl, 9, 0, TQt::AlignLeft);
h_lay = new TQHBoxLayout(); h_lay = new TQHBoxLayout();
m_pGrid->addLayout(h_lay, 9, 2); m_pGrid->addLayout(h_lay, 9, 2);
@ -381,12 +381,12 @@ void KPasswordDialog::addLine(TQString key, TQString value)
TQLabel *lbl = new TQLabel(key, m_pMain); TQLabel *lbl = new TQLabel(key, m_pMain);
lbl->setAlignment(AlignLeft|AlignTop); lbl->setAlignment(AlignLeft|AlignTop);
lbl->setFixedSize(lbl->sizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, m_Row+2, 0, (Qt::AlignmentFlags)AlignLeft); m_pGrid->addWidget(lbl, m_Row+2, 0, TQt::AlignLeft);
lbl = new TQLabel(value, m_pMain); lbl = new TQLabel(value, m_pMain);
lbl->setAlignment(AlignTop|WordBreak); lbl->setAlignment(AlignTop|WordBreak);
lbl->setFixedSize(275, lbl->heightForWidth(275)); lbl->setFixedSize(275, lbl->heightForWidth(275));
m_pGrid->addWidget(lbl, m_Row+2, 2, (Qt::AlignmentFlags)AlignLeft); m_pGrid->addWidget(lbl, m_Row+2, 2, TQt::AlignLeft);
++m_Row; ++m_Row;
} }

@ -178,7 +178,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
#endif #endif
fnt.setBold( true ); fnt.setBold( true );
ttl->setFont( fnt ); ttl->setFont( fnt );
ttl->setAlignment( Qt::AlignHCenter ); ttl->setAlignment( TQt::AlignHCenter );
if ( hb ) { if ( hb ) {
hb->setStretchFactor( ttl, 10 ); // enforce centering hb->setStretchFactor( ttl, 10 ); // enforce centering
} }
@ -442,7 +442,7 @@ void KPassivePopup::updateMask()
TQBitmap mask( width(), height(), true ); TQBitmap mask( width(), height(), true );
TQPainter p( &mask ); TQPainter p( &mask );
TQBrush brush( Qt::white, Qt::SolidPattern ); TQBrush brush( TQt::white, TQt::SolidPattern );
p.setBrush( brush ); p.setBrush( brush );
int i = 0, z = 0; int i = 0, z = 0;

@ -110,7 +110,7 @@ void KPixmapRegionSelectorWidget::updatePixmap()
painter.begin(&m_linedPixmap); painter.begin(&m_linedPixmap);
painter.setRasterOp( TQt::XorROP ); painter.setRasterOp( TQt::XorROP );
painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(),
TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); TQBrush( TQColor(255,255,255), TQt::BDiagPattern) );
painter.end(); painter.end();
TQImage image=m_linedPixmap.convertToImage(); TQImage image=m_linedPixmap.convertToImage();
@ -213,7 +213,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
TQMouseEvent *mev= (TQMouseEvent *)(ev); TQMouseEvent *mev= (TQMouseEvent *)(ev);
//kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
if ( mev->button() == Qt::RightButton ) if ( mev->button() == TQt::RightButton )
{ {
TDEPopupMenu *popup = createPopupMenu( ); TDEPopupMenu *popup = createPopupMenu( );
popup->exec( mev->globalPos() ); popup->exec( mev->globalPos() );
@ -227,12 +227,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
&& m_selectedRegion!=m_originalPixmap.rect() ) && m_selectedRegion!=m_originalPixmap.rect() )
{ {
m_state=Moving; m_state=Moving;
cursor.setShape( Qt::SizeAllCursor ); cursor.setShape( TQt::SizeAllCursor );
} }
else else
{ {
m_state=Resizing; m_state=Resizing;
cursor.setShape( Qt::CrossCursor ); cursor.setShape( TQt::CrossCursor );
} }
TQApplication::setOverrideCursor(cursor); TQApplication::setOverrideCursor(cursor);

@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e )
return; return;
} }
if ( (e->state() & Qt::LeftButton) && if ( (e->state() & TQt::LeftButton) &&
(e->pos() - startPos).manhattanLength() > (e->pos() - startPos).manhattanLength() >
TDEGlobalSettings::dndEventDelay() ) TDEGlobalSettings::dndEventDelay() )
{ {

@ -94,7 +94,7 @@ public:
KRuler::KRuler(TQWidget *parent, const char *name) KRuler::KRuler(TQWidget *parent, const char *name)
: TQFrame(parent, name), : TQFrame(parent, name),
range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE), range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE),
dir(Qt::Horizontal) dir(TQt::Horizontal)
{ {
init(); init();
setFixedHeight(FIX_WIDTH); setFixedHeight(FIX_WIDTH);
@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient,
dir(orient) dir(orient)
{ {
init(); init();
if (orient == Qt::Horizontal) if (orient == TQt::Horizontal)
setFixedHeight(FIX_WIDTH); setFixedHeight(FIX_WIDTH);
else else
setFixedWidth(FIX_WIDTH); setFixedWidth(FIX_WIDTH);
@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth,
{ {
init(); init();
if (orient == Qt::Horizontal) if (orient == TQt::Horizontal)
setFixedHeight(widgetWidth); setFixedHeight(widgetWidth);
else else
setFixedWidth(widgetWidth); setFixedWidth(widgetWidth);
@ -362,7 +362,7 @@ KRuler::setEndLabel(const TQString& label)
endlabel = label; endlabel = label;
// premeasure the fontwidth and save it // premeasure the fontwidth and save it
if (dir == Qt::Vertical) { if (dir == TQt::Vertical) {
TQFont font = this->font(); TQFont font = this->font();
font.setPointSize(LABEL_SIZE); font.setPointSize(LABEL_SIZE);
TQFontMetrics fm(font); TQFontMetrics fm(font);
@ -551,7 +551,7 @@ KRuler::slotNewValue(int _value)
} }
// get the rectangular of the old and the new ruler pointer // get the rectangular of the old and the new ruler pointer
// and repaint only him // and repaint only him
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
TQRect oldrec(-5+oldvalue,10, 11,6); TQRect oldrec(-5+oldvalue,10, 11,6);
TQRect newrec(-5+_value,10, 11,6); TQRect newrec(-5+_value,10, 11,6);
repaint( oldrec.unite(newrec) ); repaint( oldrec.unite(newrec) );
@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p)
int value = range.value(), int value = range.value(),
minval = range.minValue(), minval = range.minValue(),
maxval; maxval;
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
maxval = range.maxValue() maxval = range.maxValue()
+ offset_ + offset_
- (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length); - (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length);
@ -636,7 +636,7 @@ KRuler::drawContents(TQPainter *p)
// draw endlabel // draw endlabel
if (d->showEndL) { if (d->showEndL) {
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->translate( fontOffset, 0 ); p->translate( fontOffset, 0 );
p->drawText( END_LABEL_X, END_LABEL_Y, endlabel ); p->drawText( END_LABEL_X, END_LABEL_Y, endlabel );
} }
@ -659,7 +659,7 @@ KRuler::drawContents(TQPainter *p)
if (showtm) { if (showtm) {
fend = ppm*tmDist; fend = ppm*tmDist;
for ( f=offsetmin; f<offsetmax; f+=fend ) { for ( f=offsetmin; f<offsetmax; f+=fend ) {
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2); p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2);
} }
else { else {
@ -671,7 +671,7 @@ KRuler::drawContents(TQPainter *p)
// draw the little marks // draw the little marks
fend = ppm*lmDist; fend = ppm*lmDist;
for ( f=offsetmin; f<offsetmax; f+=fend ) { for ( f=offsetmin; f<offsetmax; f+=fend ) {
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2);
} }
else { else {
@ -683,7 +683,7 @@ KRuler::drawContents(TQPainter *p)
// draw medium marks // draw medium marks
fend = ppm*mmDist; fend = ppm*mmDist;
for ( f=offsetmin; f<offsetmax; f+=fend ) { for ( f=offsetmin; f<offsetmax; f+=fend ) {
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2);
} }
else { else {
@ -695,7 +695,7 @@ KRuler::drawContents(TQPainter *p)
// draw big marks // draw big marks
fend = ppm*bmDist; fend = ppm*bmDist;
for ( f=offsetmin; f<offsetmax; f+=fend ) { for ( f=offsetmin; f<offsetmax; f+=fend ) {
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2);
} }
else { else {
@ -705,7 +705,7 @@ KRuler::drawContents(TQPainter *p)
} }
if (showem) { if (showem) {
// draw end marks // draw end marks
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2); p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2);
p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2); p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2);
} }
@ -718,7 +718,7 @@ KRuler::drawContents(TQPainter *p)
// draw pointer // draw pointer
if (d->showpointer) { if (d->showpointer) {
TQPointArray pa(4); TQPointArray pa(4);
if (dir == Qt::Horizontal) { if (dir == TQt::Horizontal) {
pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15); pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15);
} }
else { else {

@ -40,7 +40,7 @@ struct KScrollView::KScrollViewPrivate {
bool scrolling; bool scrolling;
}; };
KScrollView::KScrollView( TQWidget *parent, const char *name, Qt::WFlags f ) KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f )
: TQScrollView( parent, name, f ) : TQScrollView( parent, name, f )
{ {
d = new KScrollViewPrivate; d = new KScrollViewPrivate;

@ -32,7 +32,7 @@ class TDEUI_EXPORT KScrollView : public TQScrollView
TQ_OBJECT TQ_OBJECT
public: public:
KScrollView( TQWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 ); KScrollView( TQWidget *parent = 0, const char *name = 0, TQt::WFlags f = 0 );
~KScrollView(); ~KScrollView();

@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation)
{ {
switch(orientation) switch(orientation)
{ {
case Qt::Vertical: case TQt::Vertical:
case VLine: case VLine:
setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); setFrameStyle( TQFrame::VLine | TQFrame::Sunken );
setMinimumSize(2, 0); setMinimumSize(2, 0);
@ -58,7 +58,7 @@ void KSeparator::setOrientation(int orientation)
default: default:
kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl; kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl;
case Qt::Horizontal: case TQt::Horizontal:
case HLine: case HLine:
setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
setMinimumSize(0, 2); setMinimumSize(0, 2);

@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
int numRows = languagesLayout->numRows(); int numRows = languagesLayout->numRows();
TQLabel *languageLabel = new TQLabel(labelText, page); TQLabel *languageLabel = new TQLabel(labelText, page);
languagesLayout->addWidget( languageLabel, numRows + 1, 1, (Qt::AlignmentFlags)TQt::AlignAuto ); languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQt::AlignmentFlags)TQt::AlignAuto );
languagesLayout->addWidget( languageButton, numRows + 1, 2, (Qt::AlignmentFlags)TQt::AlignAuto ); languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQt::AlignmentFlags)TQt::AlignAuto );
if (primaryLanguage == false) if (primaryLanguage == false)
{ {
languagesLayout->addWidget( removeButton, numRows + 1, 3, (Qt::AlignmentFlags)TQt::AlignAuto ); languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQt::AlignmentFlags)TQt::AlignAuto );
languageRowData.setRowWidgets( languageRowData.setRowWidgets(
languageLabel, languageLabel,

@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
d->on_all_desktops = false; d->on_all_desktops = false;
} }
setCaption( TDEGlobal::instance()->aboutData()->programName()); setCaption( TDEGlobal::instance()->aboutData()->programName());
setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); setAlignment( alignment() | TQt::AlignVCenter | TQt::AlignHCenter );
// Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
setScaledContents(true); setScaledContents(true);
@ -148,12 +148,12 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e )
return; return;
switch ( e->button() ) { switch ( e->button() ) {
case Qt::LeftButton: case TQt::LeftButton:
toggleActive(); toggleActive();
break; break;
case Qt::MidButton: case TQt::MidButton:
// fall through // fall through
case Qt::RightButton: case TQt::RightButton:
if ( parentWidget() ) { if ( parentWidget() ) {
TDEAction* action = d->actionCollection->action("minimizeRestore"); TDEAction* action = d->actionCollection->action("minimizeRestore");
if ( parentWidget()->isVisible() ) if ( parentWidget()->isVisible() )

@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
{ {
if( e->button() != Qt::LeftButton ) if( e->button() != TQt::LeftButton )
return; return;
TQTab *tab = selectTab( e->pos() ); TQTab *tab = selectTab( e->pos() );
@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e )
{ {
if( e->button() == Qt::LeftButton ) { if( e->button() == TQt::LeftButton ) {
mEnableCloseButtonTimer->stop(); mEnableCloseButtonTimer->stop();
mDragStart = e->pos(); mDragStart = e->pos();
} }
else if( e->button() == Qt::RightButton ) { else if( e->button() == TQt::RightButton ) {
TQTab *tab = selectTab( e->pos() ); TQTab *tab = selectTab( e->pos() );
if( tab ) { if( tab ) {
emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) );
@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e )
void KTabBar::mouseMoveEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e )
{ {
if ( e->state() == Qt::LeftButton ) { if ( e->state() == TQt::LeftButton ) {
TQTab *tab = selectTab( e->pos() ); TQTab *tab = selectTab( e->pos() );
if ( mDragSwitchTab && tab != mDragSwitchTab ) { if ( mDragSwitchTab && tab != mDragSwitchTab ) {
mActivateDragSwitchTabTimer->stop(); mActivateDragSwitchTabTimer->stop();
@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
} }
} }
} }
else if ( e->state() == Qt::MidButton ) { else if ( e->state() == TQt::MidButton ) {
if (mReorderStartTab==-1) { if (mReorderStartTab==-1) {
int delay = TDEGlobalSettings::dndEventDelay(); int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->pos(); TQPoint newPos = e->pos();
@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab()
void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) void KTabBar::mouseReleaseEvent( TQMouseEvent *e )
{ {
if( e->button() == Qt::MidButton ) { if( e->button() == TQt::MidButton ) {
if ( mReorderStartTab==-1 ) { if ( mReorderStartTab==-1 ) {
TQTab *tab = selectTab( e->pos() ); TQTab *tab = selectTab( e->pos() );
if( tab ) { if( tab ) {
@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e )
#ifndef TQT_NO_WHEELEVENT #ifndef TQT_NO_WHEELEVENT
void KTabBar::wheelEvent( TQWheelEvent *e ) void KTabBar::wheelEvent( TQWheelEvent *e )
{ {
if ( e->orientation() == Qt::Horizontal ) if ( e->orientation() == TQt::Horizontal )
return; return;
emit( wheelDelta( e->delta() ) ); emit( wheelDelta( e->delta() ) );

@ -336,7 +336,7 @@ void KTabWidget::dropEvent( TQDropEvent *e )
#ifndef TQT_NO_WHEELEVENT #ifndef TQT_NO_WHEELEVENT
void KTabWidget::wheelEvent( TQWheelEvent *e ) void KTabWidget::wheelEvent( TQWheelEvent *e )
{ {
if ( e->orientation() == Qt::Horizontal ) if ( e->orientation() == TQt::Horizontal )
return; return;
if ( isEmptyTabbarSpace( e->pos() ) ) if ( isEmptyTabbarSpace( e->pos() ) )
@ -365,7 +365,7 @@ void KTabWidget::wheelDelta(int delta)
void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
{ {
if( e->button() != Qt::LeftButton ) if( e->button() != TQt::LeftButton )
return; return;
if ( isEmptyTabbarSpace( e->pos() ) ) { if ( isEmptyTabbarSpace( e->pos() ) ) {
@ -377,12 +377,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
void KTabWidget::mousePressEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e )
{ {
if ( e->button() == Qt::RightButton ) { if ( e->button() == TQt::RightButton ) {
if ( isEmptyTabbarSpace( e->pos() ) ) { if ( isEmptyTabbarSpace( e->pos() ) ) {
emit( contextMenu( mapToGlobal( e->pos() ) ) ); emit( contextMenu( mapToGlobal( e->pos() ) ) );
return; return;
} }
} else if ( e->button() == Qt::MidButton ) { } else if ( e->button() == TQt::MidButton ) {
if ( isEmptyTabbarSpace( e->pos() ) ) { if ( isEmptyTabbarSpace( e->pos() ) ) {
emit( mouseMiddleClick() ); emit( mouseMiddleClick() );
return; return;

@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
TQLabel *l = new TQLabel(hbox); TQLabel *l = new TQLabel(hbox);
l->setPixmap(img); l->setPixmap(img);
l->setBackgroundColor(mBlendedColor); l->setBackgroundColor(mBlendedColor);
l->setAlignment(Qt::AlignRight | Qt::AlignBottom); l->setAlignment(TQt::AlignRight | TQt::AlignBottom);
resize(550, 230); resize(550, 230);
TQSize sh = size(); TQSize sh = size();

@ -37,7 +37,7 @@ public:
Private (const TQString& url, KURLLabel* label) Private (const TQString& url, KURLLabel* label)
: URL (url), : URL (url),
LinkColor (TDEGlobalSettings::linkColor()), LinkColor (TDEGlobalSettings::linkColor()),
HighlightedLinkColor (Qt::red), HighlightedLinkColor (TQt::red),
Tip(url), Tip(url),
Cursor (0L), Cursor (0L),
Underline (true), Underline (true),
@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e)
switch (e->button()) switch (e->button())
{ {
case Qt::LeftButton: case TQt::LeftButton:
emit leftClickedURL (); emit leftClickedURL ();
emit leftClickedURL (d->URL); emit leftClickedURL (d->URL);
break; break;
case Qt::MidButton: case TQt::MidButton:
emit middleClickedURL (); emit middleClickedURL ();
emit middleClickedURL (d->URL); emit middleClickedURL (d->URL);
break; break;
case Qt::RightButton: case TQt::RightButton:
emit rightClickedURL (); emit rightClickedURL ();
emit rightClickedURL (d->URL); emit rightClickedURL (d->URL);
break; break;
@ -373,7 +373,7 @@ bool KURLLabel::event (TQEvent *e)
} }
else if (e->type() == TQEvent::KeyPress) { else if (e->type() == TQEvent::KeyPress) {
TQKeyEvent* ke = TQT_TQKEYEVENT(e); TQKeyEvent* ke = TQT_TQKEYEVENT(e);
if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) { if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) {
setLinkColor (d->HighlightedLinkColor); setLinkColor (d->HighlightedLinkColor);
d->Timer->start (300); d->Timer->start (300);
emit leftClickedURL (); emit leftClickedURL ();

@ -236,9 +236,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags )
break; break;
int end = (*it); int end = (*it);
int x = textX; int x = textX;
if ( flags & Qt::AlignHCenter ) if ( flags & TQt::AlignHCenter )
x += ( maxwidth - *itw ) / 2; x += ( maxwidth - *itw ) / 2;
else if ( flags & Qt::AlignRight ) else if ( flags & TQt::AlignRight )
x += maxwidth - *itw; x += maxwidth - *itw;
painter->drawText( x, textY + y + ascent, m_text.mid( start, end - start + 1 ) ); painter->drawText( x, textY + y + ascent, m_text.mid( start, end - start + 1 ) );
y += height; y += height;
@ -246,9 +246,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags )
} }
// Draw the last line // Draw the last line
int x = textX; int x = textX;
if ( flags & Qt::AlignHCenter ) if ( flags & TQt::AlignHCenter )
x += ( maxwidth - *itw ) / 2; x += ( maxwidth - *itw ) / 2;
else if ( flags & Qt::AlignRight ) else if ( flags & TQt::AlignRight )
x += maxwidth - *itw; x += maxwidth - *itw;
if ( (d->m_constrainingRect.height() < 0) || if ( (d->m_constrainingRect.height() < 0) ||
((y + height) <= d->m_constrainingRect.height()) ) { ((y + height) <= d->m_constrainingRect.height()) ) {

@ -91,8 +91,8 @@ public:
/** /**
* Draw the text that has been previously wrapped, at position x,y. * Draw the text that has been previously wrapped, at position x,y.
* Flags are for alignment, e.g. Qt::AlignHCenter. Default is * Flags are for alignment, e.g. TQt::AlignHCenter. Default is
* Qt::AlignAuto. * TQt::AlignAuto.
* @param painter the TQPainter to use. * @param painter the TQPainter to use.
* @param x the horizontal position of the text * @param x the horizontal position of the text
* @param y the vertical position of the text * @param y the vertical position of the text

@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void )
{ {
if( mShowHeader ) if( mShowHeader )
{ {
gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (Qt::AlignmentFlags)AlignLeft ); gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQt::AlignmentFlags)AlignLeft );
gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft ); gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft );
mLabel[i]->show(); mLabel[i]->show();
mText[i]->show(); mText[i]->show();
} }
@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void )
mLabel[i]->hide(); mLabel[i]->hide();
if( !i ) if( !i )
{ {
gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (Qt::AlignmentFlags)AlignLeft ); gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft );
} }
else else
{ {
gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft ); gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft );
} }
mText[i]->show(); mText[i]->show();
} }

@ -1103,7 +1103,7 @@ void TDEAction::addContainer( TQWidget* c, TQWidget* w )
void TDEAction::activate() void TDEAction::activate()
{ {
emit activated( TDEAction::EmulatedActivation, Qt::NoButton ); emit activated( TDEAction::EmulatedActivation, TQt::NoButton );
slotActivated(); slotActivated();
} }
@ -1113,7 +1113,7 @@ void TDEAction::slotActivated()
if ( senderObj ) if ( senderObj )
{ {
if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) ) if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
emit activated( TDEAction::AccelActivation, Qt::NoButton ); emit activated( TDEAction::AccelActivation, TQt::NoButton );
} }
emit activated(); emit activated();
} }
@ -1149,7 +1149,7 @@ void TDEAction::slotPopupActivated()
} }
kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl; kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl;
emit activated( TDEAction::PopupMenuActivation, Qt::NoButton ); emit activated( TDEAction::PopupMenuActivation, TQt::NoButton );
slotActivated(); slotActivated();
} }
@ -1159,7 +1159,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
emit activated( TDEAction::ToolBarActivation, state ); emit activated( TDEAction::ToolBarActivation, state );
// RightButton isn't really an activation // RightButton isn't really an activation
if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) ) if ( ( state & TQt::LeftButton ) || ( state & TQt::MidButton ) )
slotActivated(); slotActivated();
} }

@ -115,7 +115,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
TQKeyEvent *ev = TQT_TQKEYEVENT( e ); TQKeyEvent *ev = TQT_TQKEYEVENT( e );
switch ( ev->key() ) { switch ( ev->key() ) {
case Key_BackTab: case Key_BackTab:
if ( d->tabHandling && (ev->state() == Qt::NoButton || if ( d->tabHandling && (ev->state() == TQt::NoButton ||
(ev->state() & ShiftButton)) ) { (ev->state() & ShiftButton)) ) {
up(); up();
ev->accept(); ev->accept();
@ -123,7 +123,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
} }
break; break;
case Key_Tab: case Key_Tab:
if ( d->tabHandling && (ev->state() == Qt::NoButton) ) { if ( d->tabHandling && (ev->state() == TQt::NoButton) ) {
down(); // Only on TAB!! down(); // Only on TAB!!
ev->accept(); ev->accept();
return true; return true;
@ -199,7 +199,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
break; break;
case Key_Tab: case Key_Tab:
case Key_BackTab: case Key_BackTab:
if ( ev->state() == Qt::NoButton || if ( ev->state() == TQt::NoButton ||
(ev->state() & ShiftButton)) (ev->state() & ShiftButton))
{ {
ev->accept(); ev->accept();

@ -85,8 +85,8 @@ class TDEFontChooser::TDEFontChooserPrivate
{ {
public: public:
TDEFontChooserPrivate() TDEFontChooserPrivate()
{ m_palette.setColor(TQPalette::Active, TQColorGroup::Text, Qt::black); { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black);
m_palette.setColor(TQPalette::Active, TQColorGroup::Base, Qt::white); } m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); }
TQPalette m_palette; TQPalette m_palette;
}; };
@ -132,7 +132,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
if (diff) { if (diff) {
familyCheckbox = new TQCheckBox(i18n("Font"), page); familyCheckbox = new TQCheckBox(i18n("Font"), page);
connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
familyLayout->addWidget(familyCheckbox, 0, Qt::AlignLeft); familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft);
TQString familyCBToolTipText = TQString familyCBToolTipText =
i18n("Change font family?"); i18n("Change font family?");
TQString familyCBWhatsThisText = TQString familyCBWhatsThisText =
@ -143,7 +143,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
} else { } else {
familyCheckbox = 0; familyCheckbox = 0;
familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" ); familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" );
familyLayout->addWidget(familyLabel, 1, Qt::AlignLeft); familyLayout->addWidget(familyLabel, 1, TQt::AlignLeft);
} }
gridLayout->addLayout(familyLayout, row, 0 ); gridLayout->addLayout(familyLayout, row, 0 );
@ -151,7 +151,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
if (diff) { if (diff) {
styleCheckbox = new TQCheckBox(i18n("Font style"), page); styleCheckbox = new TQCheckBox(i18n("Font style"), page);
connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
styleLayout->addWidget(styleCheckbox, 0, Qt::AlignLeft); styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft);
TQString styleCBToolTipText = TQString styleCBToolTipText =
i18n("Change font style?"); i18n("Change font style?");
TQString styleCBWhatsThisText = TQString styleCBWhatsThisText =
@ -162,7 +162,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
} else { } else {
styleCheckbox = 0; styleCheckbox = 0;
styleLabel = new TQLabel( i18n("Font style:"), page, "styleLabel"); styleLabel = new TQLabel( i18n("Font style:"), page, "styleLabel");
styleLayout->addWidget(styleLabel, 1, Qt::AlignLeft); styleLayout->addWidget(styleLabel, 1, TQt::AlignLeft);
} }
styleLayout->addSpacing( checkBoxGap ); styleLayout->addSpacing( checkBoxGap );
gridLayout->addLayout(styleLayout, row, 1 ); gridLayout->addLayout(styleLayout, row, 1 );
@ -171,7 +171,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
if (diff) { if (diff) {
sizeCheckbox = new TQCheckBox(i18n("Size"),page); sizeCheckbox = new TQCheckBox(i18n("Size"),page);
connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
sizeLayout->addWidget(sizeCheckbox, 0, Qt::AlignLeft); sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft);
TQString sizeCBToolTipText = TQString sizeCBToolTipText =
i18n("Change font size?"); i18n("Change font size?");
TQString sizeCBWhatsThisText = TQString sizeCBWhatsThisText =
@ -182,7 +182,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
} else { } else {
sizeCheckbox = 0; sizeCheckbox = 0;
sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel"); sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel");
sizeLayout->addWidget(sizeLabel, 1, Qt::AlignLeft); sizeLayout->addWidget(sizeLabel, 1, TQt::AlignLeft);
} }
sizeLayout->addSpacing( checkBoxGap ); sizeLayout->addSpacing( checkBoxGap );
sizeLayout->addSpacing( checkBoxGap ); // prevent label from eating border sizeLayout->addSpacing( checkBoxGap ); // prevent label from eating border
@ -258,7 +258,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border
sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1); sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1);
sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1); sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1);
sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, Qt::AlignLeft); sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, TQt::AlignLeft);
TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText ); TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText );
TQToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText ); TQToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText );
} }
@ -296,7 +296,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
//i18n: This is a classical test phrase. (It contains all letters from A to Z.) //i18n: This is a classical test phrase. (It contains all letters from A to Z.)
sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
sampleEdit->setAlignment(Qt::AlignCenter); sampleEdit->setAlignment(TQt::AlignCenter);
gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
TQString sampleEditWhatsThisText = TQString sampleEditWhatsThisText =
i18n("This sample text illustrates the current settings. " i18n("This sample text illustrates the current settings. "

@ -249,14 +249,14 @@ void TDEListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
if( item ) { if( item ) {
emit doubleClicked( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() );
if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) if( (e->button() == TQt::LeftButton) && !m_bUseSingle )
emitExecute( item, e->globalPos() ); emitExecute( item, e->globalPos() );
} }
} }
void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos ) void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos )
{ {
if( (btn == Qt::LeftButton) && item ) if( (btn == TQt::LeftButton) && item )
emitExecute( item, pos ); emitExecute( item, pos );
} }

@ -344,7 +344,7 @@ bool TDEListViewLineEdit::event(TQEvent *pe)
keyPressEvent(k); keyPressEvent(k);
return true; return true;
} }
else if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) && else if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) &&
p->tabOrderedRenaming() && p->itemsRenameable() && p->tabOrderedRenaming() && p->itemsRenameable() &&
!(k->state() & ControlButton || k->state() & AltButton)) !(k->state() & ControlButton || k->state() & AltButton))
{ {
@ -374,11 +374,11 @@ void TDEListViewLineEdit::keyPressEvent(TQKeyEvent *e)
emit renamePrev(i,c); emit renamePrev(i,c);
} }
} }
else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) else if (e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter)
terminate(true); terminate(true);
else if(e->key() == Qt::Key_Escape) else if(e->key() == TQt::Key_Escape)
terminate(false); terminate(false);
else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Up) else if (e->key() == TQt::Key_Down || e->key() == TQt::Key_Up)
{ {
terminate(true); terminate(true);
KLineEdit::keyPressEvent(e); KLineEdit::keyPressEvent(e);
@ -828,7 +828,7 @@ void TDEListView::contentsMousePressEvent( TQMouseEvent *e )
treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() ) treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
&& ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) );
if (e->button() == Qt::LeftButton && !rootDecoClicked) if (e->button() == TQt::LeftButton && !rootDecoClicked)
{ {
//Start a drag //Start a drag
d->startDragPos = e->pos(); d->startDragPos = e->pos();
@ -885,7 +885,7 @@ void TDEListView::contentsMouseMoveEvent( TQMouseEvent *e )
void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e ) void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e )
{ {
if (e->button() == Qt::LeftButton) if (e->button() == TQt::LeftButton)
{ {
// If the row was already selected, maybe we want to start an in-place editing // If the row was already selected, maybe we want to start an in-place editing
if ( d->pressedOnSelected && itemsRenameable() ) if ( d->pressedOnSelected && itemsRenameable() )
@ -921,7 +921,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
// We don't want to call the parent method because it does setOpen, // We don't want to call the parent method because it does setOpen,
// whereas we don't do it in single click mode... (David) // whereas we don't do it in single click mode... (David)
//TQListView::contentsMouseDoubleClickEvent( e ); //TQListView::contentsMouseDoubleClickEvent( e );
if ( !e || e->button() != Qt::LeftButton ) { if ( !e || e->button() != TQt::LeftButton ) {
return; return;
} }
@ -934,7 +934,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
if( item ) { if( item ) {
emit doubleClicked( item, e->globalPos(), col ); emit doubleClicked( item, e->globalPos(), col );
if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) { if( (e->button() == TQt::LeftButton) && !d->bUseSingle ) {
emitExecute( item, e->globalPos(), col ); emitExecute( item, e->globalPos(), col );
} }
} }
@ -942,7 +942,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c ) void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c )
{ {
if( (btn == Qt::LeftButton) && item ) { if( (btn == TQt::LeftButton) && item ) {
emitExecute(item, pos, c); emitExecute(item, pos, c);
} }
} }
@ -1601,7 +1601,7 @@ void TDEListView::fileManagerKeyPressEvent (TQKeyEvent* e)
} }
if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse))) if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse)))
&& (e_state==Qt::NoButton) && (e_state==TQt::NoButton)
&& ((e->key()==Key_Down) && ((e->key()==Key_Down)
|| (e->key()==Key_Up) || (e->key()==Key_Up)
|| (e->key()==Key_Next) || (e->key()==Key_Next)
@ -2456,7 +2456,7 @@ TQColor TDEListViewItem::backgroundColor(int column)
// calculate a different color if the current column is sorted (only if more than 1 column) // calculate a different color if the current column is sorted (only if more than 1 column)
if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) ) if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
{ {
if ( color == Qt::black ) if ( color == TQt::black )
color = TQColor(55, 55, 55); // dark gray color = TQColor(55, 55, 55); // dark gray
else else
{ {

@ -126,7 +126,7 @@ public:
TQApplication::sendEvent( window, &e ); TQApplication::sendEvent( window, &e );
canceled = !e.isAccepted(); canceled = !e.isAccepted();
/* Don't even think_about deleting widgets with /* Don't even think_about deleting widgets with
Qt::WDestructiveClose flag set at this point. We TQt::WDestructiveClose flag set at this point. We
are faking a close event, but we are *not*_ are faking a close event, but we are *not*_
closing the window. The purpose of the faked closing the window. The purpose of the faked
close event is to prepare the application so it close event is to prepare the application so it

@ -164,7 +164,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
if (!icon.isNull()) if (!icon.isNull())
label1->setPixmap(icon); label1->setPixmap(icon);
lay->addWidget( label1, 0, Qt::AlignCenter ); lay->addWidget( label1, 0, TQt::AlignCenter );
lay->addSpacing(KDialog::spacingHint()); lay->addSpacing(KDialog::spacingHint());
// Enforce <p>text</p> otherwise the word-wrap doesn't work well // Enforce <p>text</p> otherwise the word-wrap doesn't work well
TQString qt_text = qrichtextify( text ); TQString qt_text = qrichtextify( text );

@ -124,7 +124,7 @@ public:
, shortcuts(false) , shortcuts(false)
, autoExec(false) , autoExec(false)
, lastHitIndex(-1) , lastHitIndex(-1)
, state(Qt::NoButton) , state(TQt::NoButton)
, m_ctxMenu(0) , m_ctxMenu(0)
{} {}
@ -274,7 +274,7 @@ void TDEPopupMenu::closeEvent(TQCloseEvent*e)
void TDEPopupMenu::activateItemAt(int index) void TDEPopupMenu::activateItemAt(int index)
{ {
d->state = Qt::NoButton; d->state = TQt::NoButton;
TQPopupMenu::activateItemAt(index); TQPopupMenu::activateItemAt(index);
} }
@ -285,7 +285,7 @@ TQt::ButtonState TDEPopupMenu::state() const
void TDEPopupMenu::keyPressEvent(TQKeyEvent* e) void TDEPopupMenu::keyPressEvent(TQKeyEvent* e)
{ {
d->state = Qt::NoButton; d->state = TQt::NoButton;
if (!d->shortcuts) { if (!d->shortcuts) {
// continue event processing by Qpopup // continue event processing by Qpopup
//e->ignore(); //e->ignore();

@ -160,7 +160,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
void KXYSelector::wheelEvent( TQWheelEvent *e ) void KXYSelector::wheelEvent( TQWheelEvent *e )
{ {
if ( e->orientation() == Qt::Horizontal ) if ( e->orientation() == TQt::Horizontal )
setValues( xValue() + e->delta()/120, yValue() ); setValues( xValue() + e->delta()/120, yValue() );
else else
setValues( xValue(), yValue() + e->delta()/120 ); setValues( xValue(), yValue() + e->delta()/120 );
@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp )
TDESelector::TDESelector( TQWidget *parent, const char *name ) TDESelector::TDESelector( TQWidget *parent, const char *name )
: TQWidget( parent, name ), TQRangeControl() : TQWidget( parent, name ), TQRangeControl()
{ {
_orientation = Qt::Horizontal; _orientation = TQt::Horizontal;
_indent = true; _indent = true;
} }
@ -258,7 +258,7 @@ TQRect TDESelector::contentsRect() const
{ {
int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w; int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw ); return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
else else
return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 ); return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 );
@ -277,7 +277,7 @@ void TDESelector::paintEvent( TQPaintEvent * )
if ( indent() ) if ( indent() )
{ {
TQRect r = rect(); TQRect r = rect();
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
r.addCoords(0, iw - w, -iw, w - iw); r.addCoords(0, iw - w, -iw, w - iw);
else else
r.addCoords(iw - w, 0, w - iw, -iw); r.addCoords(iw - w, 0, w - iw, -iw);
@ -332,7 +332,7 @@ void TDESelector::moveArrow( const TQPoint &pos )
int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w; int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w) val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w)
/ (height()-iw*2) + minValue(); / (height()-iw*2) + minValue();
else else
@ -348,7 +348,7 @@ TQPoint TDESelector::calcArrowPos( int val )
int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w; int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
{ {
p.setY( height() - ( (height()-2*iw) * val p.setY( height() - ( (height()-2*iw) * val
/ ( maxValue() - minValue() ) + 5 ) ); / ( maxValue() - minValue() ) + 5 ) );
@ -377,7 +377,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
painter->setBrush( TQBrush( colorGroup().buttonText() ) ); painter->setBrush( TQBrush( colorGroup().buttonText() ) );
array.setPoint( 0, pos.x()+0, pos.y()+0 ); array.setPoint( 0, pos.x()+0, pos.y()+0 );
array.setPoint( 1, pos.x()+5, pos.y()+5 ); array.setPoint( 1, pos.x()+5, pos.y()+5 );
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
{ {
array.setPoint( 2, pos.x()+5, pos.y()-5 ); array.setPoint( 2, pos.x()+5, pos.y()-5 );
} }
@ -390,7 +390,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
} }
else else
{ {
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
{ {
repaint(pos.x(), pos.y()-5, 6, 11, true); repaint(pos.x(), pos.y()-5, 6, 11, true);
} }
@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter )
int greenDiff = color2.green() - color1.green(); int greenDiff = color2.green() - color1.green();
int blueDiff = color2.blue() - color1.blue(); int blueDiff = color2.blue() - color1.blue();
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
{ {
for ( int y = 0; y < image.height(); y++ ) for ( int y = 0; y < image.height(); y++ )
{ {
@ -488,7 +488,7 @@ void KGradientSelector::drawContents( TQPainter *painter )
painter->drawPixmap( contentsRect().x(), contentsRect().y(), p ); painter->drawPixmap( contentsRect().x(), contentsRect().y(), p );
if ( orientation() == Qt::Vertical ) if ( orientation() == TQt::Vertical )
{ {
int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2; int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2;
int xPos = contentsRect().left() + (contentsRect().width() - int xPos = contentsRect().left() + (contentsRect().width() -

@ -167,7 +167,7 @@ void TDEToolBarSeparator::drawContents( TQPainter* p )
if ( line ) { if ( line ) {
TQStyle::SFlags flags = TQStyle::Style_Default; TQStyle::SFlags flags = TQStyle::Style_Default;
if ( orientation() == Qt::Horizontal ) if ( orientation() == TQt::Horizontal )
flags = flags | TQStyle::Style_Horizontal; flags = flags | TQStyle::Style_Horizontal;
style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
@ -185,7 +185,7 @@ void TDEToolBarSeparator::styleChange( TQStyle& )
TQSize TDEToolBarSeparator::sizeHint() const TQSize TDEToolBarSeparator::sizeHint() const
{ {
int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); return orientation() == TQt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
} }
TQSizePolicy TDEToolBarSeparator::sizePolicy() const TQSizePolicy TDEToolBarSeparator::sizePolicy() const
@ -1159,7 +1159,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
return; return;
TQMainWindow *mw = mainWindow(); TQMainWindow *mw = mainWindow();
if ( mw->toolBarsMovable() && d->m_enableContext ) { if ( mw->toolBarsMovable() && d->m_enableContext ) {
if ( m->button() == Qt::RightButton ) { if ( m->button() == TQt::RightButton ) {
TQGuardedPtr<TDEToolBar> guard( this ); TQGuardedPtr<TDEToolBar> guard( this );
int i = contextMenu()->exec( m->globalPos(), 0 ); int i = contextMenu()->exec( m->globalPos(), 0 );
// "Configure Toolbars" recreates toolbars, so we might not exist anymore. // "Configure Toolbars" recreates toolbars, so we might not exist anymore.
@ -1240,7 +1240,7 @@ void TDEToolBar::rebuildLayout()
continue; continue;
TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w); TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w);
if ( ktbs && !ktbs->showLine() ) { if ( ktbs && !ktbs->showLine() ) {
l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
w->hide(); w->hide();
continue; continue;
} }
@ -1248,7 +1248,7 @@ void TDEToolBar::rebuildLayout()
continue; continue;
l->addWidget( w ); l->addWidget( w );
w->show(); w->show();
if ((orientation() == Qt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? if ((orientation() == TQt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
l->addSpacing(2); // A little bit extra spacing behind it. l->addSpacing(2); // A little bit extra spacing behind it.
} }
if ( rightAligned ) { if ( rightAligned ) {
@ -1337,7 +1337,7 @@ void TDEToolBar::setStretchableWidget( TQWidget *w )
TQSizePolicy TDEToolBar::sizePolicy() const TQSizePolicy TDEToolBar::sizePolicy() const
{ {
if ( orientation() == Qt::Horizontal ) if ( orientation() == TQt::Horizontal )
return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
else else
return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );

@ -455,10 +455,10 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e )
{ {
d->m_buttonDown = true; d->m_buttonDown = true;
if ( e->button() == Qt::MidButton ) if ( e->button() == TQt::MidButton )
{ {
// Get TQToolButton to show the button being down while pressed // Get TQToolButton to show the button being down while pressed
TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::LeftButton, e->state() );
TQToolButton::mousePressEvent(&ev); TQToolButton::mousePressEvent(&ev);
return; return;
} }
@ -468,9 +468,9 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e )
void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e ) void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e )
{ {
TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask));
if ( e->button() == Qt::MidButton ) if ( e->button() == TQt::MidButton )
{ {
TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), TQt::LeftButton, e->state() );
TQToolButton::mouseReleaseEvent(&ev); TQToolButton::mouseReleaseEvent(&ev);
} }
else else
@ -676,8 +676,8 @@ void TDEToolBarButton::slotClicked()
// emit buttonClicked when the button was clicked while being in an extension popupmenu // emit buttonClicked when the button was clicked while being in an extension popupmenu
if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
ButtonState state = TDEApplication::keyboardMouseState(); ButtonState state = TDEApplication::keyboardMouseState();
if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) if ( ( state & TQt::MouseButtonMask ) == TQt::NoButton )
state = ButtonState( Qt::LeftButton | state ); state = ButtonState( TQt::LeftButton | state );
emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton
} }
} }

@ -85,8 +85,8 @@ void TDEToolBarLabelAction::init()
konq_misc.cpp */ konq_misc.cpp */
d->m_label->setBackgroundMode(TQt::PaletteButton); d->m_label->setBackgroundMode(TQt::PaletteButton);
d->m_label->setAlignment((TQApplication::reverseLayout() d->m_label->setAlignment((TQApplication::reverseLayout()
? Qt::AlignRight : Qt::AlignLeft) | ? TQt::AlignRight : TQt::AlignLeft) |
Qt::AlignVCenter | TQt::ShowPrefix ); TQt::AlignVCenter | TQt::ShowPrefix );
d->m_label->adjustSize(); d->m_label->adjustSize();
} }

@ -35,7 +35,7 @@ class TQLabel;
* *
* KHistoryCombo* findCombo = new KHistoryCombo(true, this); * KHistoryCombo* findCombo = new KHistoryCombo(true, this);
* KWidgetAction* action * KWidgetAction* action
* = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this, * = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this,
* TQT_SLOT(slotFocus()), actionCollection(), "find_combo"); * TQT_SLOT(slotFocus()), actionCollection(), "find_combo");
* *
* new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this, * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this,

@ -66,7 +66,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
hBox->addSpacing( 5 ); hBox->addSpacing( 5 );
//Selection mode selection //Selection mode selection
m_pbgMode = new TQButtonGroup( 1, Qt::Horizontal, "Selection Mode", this); m_pbgMode = new TQButtonGroup( 1, TQt::Horizontal, "Selection Mode", this);
m_pbgMode->insert(new TQRadioButton("NoSlection", m_pbgMode), TopLevel::NoSelection ); m_pbgMode->insert(new TQRadioButton("NoSlection", m_pbgMode), TopLevel::NoSelection );
m_pbgMode->insert(new TQRadioButton("Single", m_pbgMode), TopLevel::Single ); m_pbgMode->insert(new TQRadioButton("Single", m_pbgMode), TopLevel::Single );
m_pbgMode->insert(new TQRadioButton("Multi", m_pbgMode), TopLevel::Multi ); m_pbgMode->insert(new TQRadioButton("Multi", m_pbgMode), TopLevel::Multi );
@ -78,17 +78,17 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
this, TQT_SLOT( slotSwitchMode( int ) ) ); this, TQT_SLOT( slotSwitchMode( int ) ) );
//Signal labels //Signal labels
TQGroupBox* gbWiget = new TQGroupBox( 1, Qt::Horizontal, "Widget", this); TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this);
m_plblWidget = new TQLabel( gbWiget ); m_plblWidget = new TQLabel( gbWiget );
vBox->addWidget( gbWiget ); vBox->addWidget( gbWiget );
TQGroupBox* gbSignal = new TQGroupBox( 1, Qt::Horizontal, "emitted Signal", this); TQGroupBox* gbSignal = new TQGroupBox( 1, TQt::Horizontal, "emitted Signal", this);
m_plblSignal = new TQLabel( gbSignal ); m_plblSignal = new TQLabel( gbSignal );
vBox->addWidget( gbSignal ); vBox->addWidget( gbSignal );
TQGroupBox* gbItem = new TQGroupBox( 1, Qt::Horizontal, "on Item", this); TQGroupBox* gbItem = new TQGroupBox( 1, TQt::Horizontal, "on Item", this);
m_plblItem = new TQLabel( gbItem ); m_plblItem = new TQLabel( gbItem );
vBox->addWidget( gbItem ); vBox->addWidget( gbItem );
TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this); TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this);
TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView); TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView);
vBox->addWidget( bgListView ); vBox->addWidget( bgListView );
connect( cbListView, TQT_SIGNAL( toggled( bool ) ), connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
@ -97,7 +97,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
TDEGlobal::config()->reparseConfiguration(); TDEGlobal::config()->reparseConfiguration();
//Create IconView //Create IconView
TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this); TQGroupBox* gbIconView = new TQGroupBox( 1, TQt::Horizontal, "TDEIconView", this);
m_pIconView = new TDEIconView( gbIconView ); m_pIconView = new TDEIconView( gbIconView );
hBox->addWidget( gbIconView ); hBox->addWidget( gbIconView );
hBox->addSpacing( 5 ); hBox->addSpacing( 5 );
@ -105,7 +105,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
//Create ListView //Create ListView
TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this); TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this);
m_pListView = new TDEListView( gbListView ); m_pListView = new TDEListView( gbListView );
m_pListView->addColumn("Item"); m_pListView->addColumn("Item");
m_pListView->addColumn("Text"); m_pListView->addColumn("Text");
@ -115,7 +115,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) ); this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) );
//Create ListBox //Create ListBox
TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this); TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this);
m_pListBox = new TDEListBox( gbListBox ); m_pListBox = new TDEListBox( gbListBox );
hBox->addWidget( gbListBox ); hBox->addWidget( gbListBox );
connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ),

@ -28,7 +28,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/)
image = TQImage("testimage.png"); image = TQImage("testimage.png");
TQPainter p(this); TQPainter p(this);
p.setPen(Qt::black); p.setPen(TQt::black);
// you see here use of anti_dir param (blend from down to up, here) // you see here use of anti_dir param (blend from down to up, here)
time.start(); time.start();

@ -37,7 +37,7 @@ int main(int argc, char **argv) {
"the window!\n" "the window!\n"
"Press OK or Cancel when done" "Press OK or Cancel when done"
, w); , w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
@ -65,7 +65,7 @@ int main(int argc, char **argv) {
TQLabel *l = new TQLabel("Another common dialog\n\n"\ TQLabel *l = new TQLabel("Another common dialog\n\n"\
"OK and Cancel are right aligned\n"\ "OK and Cancel are right aligned\n"\
"Try resizing the window!", w); "Try resizing the window!", w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
@ -91,7 +91,7 @@ int main(int argc, char **argv) {
TQLabel *l = new TQLabel("Another common dialog\n\n"\ TQLabel *l = new TQLabel("Another common dialog\n\n"\
"OK and Cancel are middle aligned\n"\ "OK and Cancel are middle aligned\n"\
"Try resizing the window!", w); "Try resizing the window!", w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
@ -120,7 +120,7 @@ int main(int argc, char **argv) {
"the maximum width for all buttons\n" "the maximum width for all buttons\n"
"since it will look ugly -- " "since it will look ugly -- "
"anyway, it works", w); "anyway, it works", w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
@ -152,7 +152,7 @@ int main(int argc, char **argv) {
"prevent this strange effect as seen\n" "prevent this strange effect as seen\n"
"the former example!" "the former example!"
,w); ,w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
@ -182,7 +182,7 @@ int main(int argc, char **argv) {
"to make vertically aligned buttons\n" "to make vertically aligned buttons\n"
"too?" "too?"
,w); ,w);
l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
l->setMinimumSize(l->sizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);

@ -33,7 +33,7 @@ int main( int argc, char *argv[] )
aConfig.setGroup( "KColorDialog-test" ); aConfig.setGroup( "KColorDialog-test" );
color = aConfig.readColorEntry( "Chosen" ); color = aConfig.readColorEntry( "Chosen" );
int nRet = KColorDialog::getColor( color, Qt::red /*testing default color*/ ); int nRet = KColorDialog::getColor( color, TQt::red /*testing default color*/ );
aConfig.writeEntry( "Chosen", color ); aConfig.writeEntry( "Chosen", color );
return nRet; return nRet;

@ -25,7 +25,7 @@ void KColorWidget::paintEvent(TQPaintEvent *)
{ {
if(!pixmap.isNull()) if(!pixmap.isNull())
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
void KColorWidget::doIntensityLoop() void KColorWidget::doIntensityLoop()
@ -58,7 +58,7 @@ void KColorWidget::doIntensityLoop()
} }
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
stop = t.elapsed(); stop = t.elapsed();
tqDebug ("Total fullscreen %s dim time for %d steps : %f s", tqDebug ("Total fullscreen %s dim time for %d steps : %f s",
@ -71,7 +71,7 @@ void KColorWidget::doIntensityLoop()
KImageEffect::fade(image, 1./max, black); KImageEffect::fade(image, 1./max, black);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
} }
stop = t.elapsed(); stop = t.elapsed();
@ -87,14 +87,14 @@ void KColorWidget::doIntensityLoop()
KImageEffect::intensity(image, 1./max); KImageEffect::intensity(image, 1./max);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
for(count=0; count < max; ++count){ for(count=0; count < max; ++count){
KImageEffect::intensity(image, -1./max); KImageEffect::intensity(image, -1./max);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
image = original; image.detach(); image = original; image.detach();
@ -103,13 +103,13 @@ void KColorWidget::doIntensityLoop()
KImageEffect::channelIntensity(image, -1./max, KImageEffect::Red); KImageEffect::channelIntensity(image, -1./max, KImageEffect::Red);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
for(count=0; count < max; ++count){ for(count=0; count < max; ++count){
KImageEffect::channelIntensity(image, 1./max, KImageEffect::Red); KImageEffect::channelIntensity(image, 1./max, KImageEffect::Red);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
image = original; image.detach(); image = original; image.detach();
@ -118,13 +118,13 @@ void KColorWidget::doIntensityLoop()
KImageEffect::channelIntensity(image, -1./max, KImageEffect::Green); KImageEffect::channelIntensity(image, -1./max, KImageEffect::Green);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
for(count=0; count < max; ++count){ for(count=0; count < max; ++count){
KImageEffect::channelIntensity(image, 1./max, KImageEffect::Green); KImageEffect::channelIntensity(image, 1./max, KImageEffect::Green);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
image = original; image.detach(); image = original; image.detach();
@ -133,13 +133,13 @@ void KColorWidget::doIntensityLoop()
KImageEffect::channelIntensity(image, -1./max, KImageEffect::Blue); KImageEffect::channelIntensity(image, -1./max, KImageEffect::Blue);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
for(count=0; count < max; ++count){ for(count=0; count < max; ++count){
KImageEffect::channelIntensity(image, 1./max, KImageEffect::Blue); KImageEffect::channelIntensity(image, 1./max, KImageEffect::Blue);
pixmap.convertFromImage(image); pixmap.convertFromImage(image);
bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
Qt::CopyROP, true); TQt::CopyROP, true);
} }
} }
} }

@ -38,11 +38,11 @@ Form1::Form1( TQWidget* parent, const char* name )
GroupBox1 = new TQGroupBox( this, "GroupBox1" ); GroupBox1 = new TQGroupBox( this, "GroupBox1" );
GroupBox1->setTitle( "Completion Test" ); GroupBox1->setTitle( "Completion Test" );
GroupBox1->setColumnLayout(0, Qt::Vertical ); GroupBox1->setColumnLayout(0, TQt::Vertical );
GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 ); GroupBox1->layout()->setMargin( 0 );
GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
GroupBox1Layout->setAlignment( Qt::AlignTop ); GroupBox1Layout->setAlignment( TQt::AlignTop );
GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setMargin( 11 );

@ -33,7 +33,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
TQString say; TQString say;
TQPainter p(this); TQPainter p(this);
p.setPen(Qt::black); p.setPen(TQt::black);
// original image // original image
time.start(); time.start();

@ -18,7 +18,7 @@ DockTest::DockTest( TQWidget* parent )
m_blueDock->setCaption( "Blue" ); m_blueDock->setCaption( "Blue" );
m_blueDock->setGeometry( 50, 50, 100, 100 ); m_blueDock->setGeometry( 50, 50, 100, 100 );
TQWidget *l = new TQWidget( m_blueDock ); TQWidget *l = new TQWidget( m_blueDock );
l->setBackgroundColor( Qt::blue ); l->setBackgroundColor( TQt::blue );
l->setMinimumSize( 100,100 ); l->setMinimumSize( 100,100 );
m_blueDock->setWidget( l ); m_blueDock->setWidget( l );
@ -32,7 +32,7 @@ DockTest::DockTest( TQWidget* parent )
m_redDock->setCaption( "Red" ); m_redDock->setCaption( "Red" );
m_redDock->setGeometry( 50, 50, 100, 100 ); m_redDock->setGeometry( 50, 50, 100, 100 );
l = new TQWidget( m_redDock ); l = new TQWidget( m_redDock );
l->setBackgroundColor( Qt::red ); l->setBackgroundColor( TQt::red );
l->setMinimumSize( 100,100 ); l->setMinimumSize( 100,100 );
m_redDock->setWidget( l ); m_redDock->setWidget( l );
m_redDock->manualDock( m_blueDock, KDockWidget::DockLeft, 3000 ); m_redDock->manualDock( m_blueDock, KDockWidget::DockLeft, 3000 );
@ -45,7 +45,7 @@ DockTest::DockTest( TQWidget* parent )
m_yellowDock->setCaption( "Yellow" ); m_yellowDock->setCaption( "Yellow" );
m_yellowDock->setGeometry( 50, 50, 100, 100 ); m_yellowDock->setGeometry( 50, 50, 100, 100 );
l = new TQWidget( m_yellowDock ); l = new TQWidget( m_yellowDock );
l->setBackgroundColor( Qt::yellow ); l->setBackgroundColor( TQt::yellow );
l->setMinimumSize( 100,100 ); l->setMinimumSize( 100,100 );
m_yellowDock->setWidget( l ); m_yellowDock->setWidget( l );
m_yellowDock->manualDock( m_blueDock, KDockWidget::DockTop, 5000 ); m_yellowDock->manualDock( m_blueDock, KDockWidget::DockTop, 5000 );

@ -13,13 +13,13 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/)
int it, ft; int it, ft;
TQString say; TQString say;
TQColor ca = Qt::black, cb = Qt::blue; TQColor ca = TQt::black, cb = TQt::blue;
int x = 0, y = 0; int x = 0, y = 0;
pix.resize(width()/cols, height()/rows); pix.resize(width()/cols, height()/rows);
TQPainter p(this); TQPainter p(this);
p.setPen(Qt::white); p.setPen(TQt::white);
// draw once, so that the benchmarking be fair :-) // draw once, so that the benchmarking be fair :-)
KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient);

@ -21,7 +21,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
pix.resize(width()/cols, height()/rows); pix.resize(width()/cols, height()/rows);
TQPainter p(this); TQPainter p(this);
p.setPen(Qt::white); p.setPen(TQt::white);
// draw once, so that the benchmarking be fair :-) // draw once, so that the benchmarking be fair :-)
KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient);
@ -86,9 +86,9 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
pix.resize(width()/cols, height()/rows); pix.resize(width()/cols, height()/rows);
say.setNum( ft - it); say += " ms, CrossDiagonal"; say.setNum( ft - it); say += " ms, CrossDiagonal";
p.drawPixmap(x*width()/cols, y*height()/rows, pix); p.drawPixmap(x*width()/cols, y*height()/rows, pix);
p.setPen(Qt::blue); p.setPen(TQt::blue);
p.drawText(5+(x++)*width()/cols, 15+y*height()/rows, say); p.drawText(5+(x++)*width()/cols, 15+y*height()/rows, say);
p.setPen(Qt::white); p.setPen(TQt::white);
y++; // next row y++; // next row

@ -22,7 +22,7 @@ KLedTest::KLedTest(TQWidget* parent)
if (kled_round) { if (kled_round) {
//KLed l(KLed::red, &qw); // create lamp //KLed l(KLed::red, &qw); // create lamp
//KLed l(KLed::blue, &qw); // create lamp //KLed l(KLed::blue, &qw); // create lamp
l = new KLed(Qt::green, this); // create lamp l = new KLed(TQt::green, this); // create lamp
//KLed l(KLed::yellow, &qw); // create lamp //KLed l(KLed::yellow, &qw); // create lamp
//KLed l(KLed::orange, &qw); // create lamp //KLed l(KLed::orange, &qw); // create lamp
@ -55,7 +55,7 @@ KLedTest::KLedTest(TQWidget* parent)
for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
{ {
leds[index]=new KLed(Qt::yellow, state, leds[index]=new KLed(TQt::yellow, state,
(KLed::Look)(look+1), (KLed::Look)(look+1),
(KLed::Shape)(shape+1), this); (KLed::Shape)(shape+1), this);
leds[index]->setGeometry(x, y, LedWidth, LedHeight); leds[index]->setGeometry(x, y, LedWidth, LedHeight);

@ -21,8 +21,8 @@ Test::Test( TQWidget* parent, const char *name )
mWidget->addTab( new TQLabel( "Testlabel 2", mWidget ), "Two" ); mWidget->addTab( new TQLabel( "Testlabel 2", mWidget ), "Two" );
mWidget->addTab( new TQWidget( mWidget), SmallIcon( "konsole" ), "Three" ); mWidget->addTab( new TQWidget( mWidget), SmallIcon( "konsole" ), "Three" );
mWidget->addTab( new TQWidget( mWidget), "Four" ); mWidget->addTab( new TQWidget( mWidget), "Four" );
mWidget->setTabColor( mWidget->page(0), Qt::red ); mWidget->setTabColor( mWidget->page(0), TQt::red );
mWidget->setTabColor( mWidget->page(1), Qt::blue ); mWidget->setTabColor( mWidget->page(1), TQt::blue );
connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) ); connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) );
connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & ))); connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & )));
@ -89,7 +89,7 @@ Test::Test( TQWidget* parent, const char *name )
void Test::currentChanged(TQWidget* w) void Test::currentChanged(TQWidget* w)
{ {
mWidget->setTabColor( w, Qt::black ); mWidget->setTabColor( w, TQt::black );
} }
void Test::addTab() void Test::addTab()
@ -326,7 +326,7 @@ void Test::mouseDoubleClick(TQWidget *w)
mWidget->label( mWidget->indexOf( w ) ), &ok, this ); mWidget->label( mWidget->indexOf( w ) ), &ok, this );
if ( ok && !text.isEmpty() ) { if ( ok && !text.isEmpty() ) {
mWidget->changeTab( w, text ); mWidget->changeTab( w, text );
mWidget->setTabColor( w, Qt::green ); mWidget->setTabColor( w, TQt::green );
} }
} }

@ -20,13 +20,13 @@ void KGradientWidget::paintEvent(TQPaintEvent *)
int it, ft; int it, ft;
TQString say; TQString say;
TQColor ca = Qt::black, cb = Qt::cyan; TQColor ca = TQt::black, cb = TQt::cyan;
int x = 0, y = 0; int x = 0, y = 0;
pix.resize(width()/cols, height()/rows); pix.resize(width()/cols, height()/rows);
TQPainter p(this); TQPainter p(this);
p.setPen(Qt::white); p.setPen(TQt::white);
// draw once, so that the benchmarking be fair :-) // draw once, so that the benchmarking be fair :-)
KPixmapEffect::unbalancedGradient(pix,ca, cb, KPixmapEffect::unbalancedGradient(pix,ca, cb,

@ -37,7 +37,7 @@ int main(int argc, char **argv)
TQString msg = TQString("This is page %1 out of 10").arg(i); TQString msg = TQString("This is page %1 out of 10").arg(i);
TQLabel *label = new TQLabel(msg, p); TQLabel *label = new TQLabel(msg, p);
TQHBoxLayout *layout = new TQHBoxLayout(p, 5); TQHBoxLayout *layout = new TQHBoxLayout(p, 5);
label->setAlignment(Qt::AlignCenter); label->setAlignment(TQt::AlignCenter);
label->setFixedSize(300, 200); label->setFixedSize(300, 200);
layout->addWidget(label); layout->addWidget(label);
TQString title = TQString("%1. page").arg(i); TQString title = TQString("%1. page").arg(i);

@ -48,7 +48,7 @@ int main( int argc, char **argv )
Client *part = new Client; Client *part = new Client;
(void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" ); (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" );
(void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
part->setXMLFile( "./kxmlguitest_part.rc" ); part->setXMLFile( "./kxmlguitest_part.rc" );

@ -25,7 +25,7 @@ main(int argc, char**argv)
TQApplication a(argc,argv); TQApplication a(argc,argv);
TQWidget *main = new TQVBox(NULL,"main",Qt::WDestructiveClose); TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose);
TQWidget *top = new TQHBox(main); TQWidget *top = new TQHBox(main);
TQPushButton *quit = new TQPushButton("Quit", top); TQPushButton *quit = new TQPushButton("Quit", top);
TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) ); TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) );

@ -116,7 +116,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
topLayout->setSpacing( KDialog::spacingHint() ); topLayout->setSpacing( KDialog::spacingHint() );
topLayout->setMargin( 0 ); topLayout->setMargin( 0 );
m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page); m_findGrp = new TQGroupBox(0, TQt::Vertical, i18n("Find"), page);
m_findGrp->layout()->setSpacing( KDialog::spacingHint() ); m_findGrp->layout()->setSpacing( KDialog::spacingHint() );
// m_findGrp->layout()->setMargin( KDialog::marginHint() ); // m_findGrp->layout()->setMargin( KDialog::marginHint() );
m_findLayout = new TQGridLayout(m_findGrp->layout()); m_findLayout = new TQGridLayout(m_findGrp->layout());
@ -137,7 +137,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
m_findLayout->addWidget(m_regExpItem, 2, 1); m_findLayout->addWidget(m_regExpItem, 2, 1);
topLayout->addWidget(m_findGrp); topLayout->addWidget(m_findGrp);
m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page); m_replaceGrp = new TQGroupBox(0, TQt::Vertical, i18n("Replace With"), page);
m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() ); m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() );
// m_replaceGrp->layout()->setMargin( KDialog::marginHint() ); // m_replaceGrp->layout()->setMargin( KDialog::marginHint() );
m_replaceLayout = new TQGridLayout(m_replaceGrp->layout()); m_replaceLayout = new TQGridLayout(m_replaceGrp->layout());
@ -159,7 +159,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
m_replaceLayout->addWidget(m_backRefItem, 2, 1); m_replaceLayout->addWidget(m_backRefItem, 2, 1);
topLayout->addWidget(m_replaceGrp); topLayout->addWidget(m_replaceGrp);
m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page); m_optionGrp = new TQGroupBox(0, TQt::Vertical, i18n("Options"), page);
m_optionGrp->layout()->setSpacing(KDialog::spacingHint()); m_optionGrp->layout()->setSpacing(KDialog::spacingHint());
// m_optionGrp->layout()->setMargin(KDialog::marginHint()); // m_optionGrp->layout()->setMargin(KDialog::marginHint());
optionsLayout = new TQGridLayout(m_optionGrp->layout()); optionsLayout = new TQGridLayout(m_optionGrp->layout());

@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
{ {
//FIXME: not very verbose //FIXME: not very verbose
TQLabel * label = new TQLabel( i18n( "Error" ), parent ); TQLabel * label = new TQLabel( i18n( "Error" ), parent );
label->setAlignment( Qt::AlignCenter ); label->setAlignment( TQt::AlignCenter );
return label; return label;
} }
@ -264,7 +264,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
{ {
//if we have Services for the plugin we should be able to //if we have Services for the plugin we should be able to
//create KCM(s) //create KCM(s)
TQApplication::setOverrideCursor( Qt::WaitCursor ); TQApplication::setOverrideCursor( TQt::WaitCursor );
if( plugininfo->kcmServices().size() > 1 ) if( plugininfo->kcmServices().size() > 1 )
{ {
// we need a tabwidget // we need a tabwidget
@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
hbox->setAutoAdd( true ); hbox->setAutoAdd( true );
TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this ); TQSplitter* splitter = new TQSplitter( TQt::Horizontal, this );
d->frame = new TQFrame( splitter, "KPluginSelector left frame" ); d->frame = new TQFrame( splitter, "KPluginSelector left frame" );
d->frame->setFrameStyle( TQFrame::NoFrame ); d->frame->setFrameStyle( TQFrame::NoFrame );
( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); ( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ), TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ),
d->widgetstack ); d->widgetstack );
( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
label->setAlignment( Qt::AlignCenter ); label->setAlignment( TQt::AlignCenter );
label->setMinimumSize( 200, 200 ); label->setMinimumSize( 200, 200 );
d->widgetstack->addWidget( label, 1 ); d->widgetstack->addWidget( label, 1 );

@ -155,7 +155,7 @@ TDECModule * TDECModuleProxy::realModule() const
if( d->rootMode ) if( d->rootMode )
return 0; return 0;
TQApplication::setOverrideCursor( Qt::WaitCursor ); TQApplication::setOverrideCursor( TQt::WaitCursor );
TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this ); TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this );
@ -301,7 +301,7 @@ void TDECModuleProxy::runAsRoot()
if ( !moduleInfo().needsRootPrivileges() ) if ( !moduleInfo().needsRootPrivileges() )
return; return;
TQApplication::setOverrideCursor( Qt::WaitCursor ); TQApplication::setOverrideCursor( TQt::WaitCursor );
delete d->rootProcess; delete d->rootProcess;
delete d->embedWidget; delete d->embedWidget;

@ -74,8 +74,8 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult
addChild(box); addChild(box);
setFrameStyle(NoFrame); setFrameStyle(NoFrame);
viewport()->setBackgroundMode(TQt::PaletteBackground); viewport()->setBackgroundMode(TQt::PaletteBackground);
/* box->setPaletteBackgroundColor(Qt::red); /* box->setPaletteBackgroundColor(TQt::red);
setPaletteBackgroundColor(Qt::green);*/ setPaletteBackgroundColor(TQt::green);*/
} }
void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)

@ -281,7 +281,7 @@ ConstructorArgs=(TDEABC::LdapConfigWidget::W_ALL, parent, name)
IncludeFile=karrowbutton.h IncludeFile=karrowbutton.h
ToolTip=Draws a button which shows an arrow pointing into a certain direction. ToolTip=Draws a button which shows an arrow pointing into a certain direction.
Group=Buttons (KDE) Group=Buttons (KDE)
ConstructorArgs=(parent,Qt::UpArrow,name) ConstructorArgs=(parent,TQt::UpArrow,name)
[KAnimWidget] [KAnimWidget]
IncludeFile=kanimwidget.h IncludeFile=kanimwidget.h

Loading…
Cancel
Save