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

Rename obsolete tq methods to standard names

Browse Source 
(cherry picked from commit 89856e749b)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 632b7d40cf
commit a3f1234ece
103 changed files with 469 additions and 469 deletions
Show Stats Download Patch File Download Diff File

2
ark/arkviewer.cpp
Unescape View File

@ -40,7 +40,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name )
: KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 ) : KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 )
{ {
m_widget = new TQVBox( this ); m_widget = new TQVBox( this );
m_widget->tqlayout()->setSpacing( 10 ); m_widget->layout()->setSpacing( 10 );
connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) );

4
ark/extractiondialog.cpp
Unescape View File

@ -69,7 +69,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQVBox *vbox = makeVBoxMainWidget(); TQVBox *vbox = makeVBoxMainWidget();
TQHBox *header = new TQHBox( vbox ); TQHBox *header = new TQHBox( vbox );
header->tqlayout()->setSpacing( 10 ); header->layout()->setSpacing( 10 );
TQLabel *icon = new TQLabel( header ); TQLabel *icon = new TQLabel( header );
icon->setPixmap( DesktopIcon( "ark_extract" ) ); icon->setPixmap( DesktopIcon( "ark_extract" ) );
@ -78,7 +78,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
if ( enableSelected ) if ( enableSelected )
{ {
TQVBox *whichFiles = new TQVBox( header ); TQVBox *whichFiles = new TQVBox( header );
whichFiles->tqlayout()->setSpacing( 6 ); whichFiles->layout()->setSpacing( 6 );
new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" ) new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" )
.arg( i18n( "Extract:" ) ), whichFiles ); .arg( i18n( "Extract:" ) ), whichFiles );
TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles ); TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles );

2
ark/general.ui
Unescape View File

@ -37,7 +37,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
ark/rar.cpp
Unescape View File

@ -90,10 +90,10 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
bool RarArch::processLine( const TQCString &line ) bool RarArch::processLine( const TQCString &line )
{ {
TQString tqunicode_line; TQString unicode_line;
TQTextCodec *codec = TQTextCodec::codecForLocale(); TQTextCodec *codec = TQTextCodec::codecForLocale();
tqunicode_line = codec->toUnicode( line ); unicode_line = codec->toUnicode( line );
if ( m_isFirstLine ) if ( m_isFirstLine )
{ {

6
charselectapplet/charselectapplet.cpp
Unescape View File

@ -66,7 +66,7 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac
cell_height = c->readNumEntry("CellHeight", cell_height); cell_height = c->readNumEntry("CellHeight", cell_height);
TQString characters = c->readEntry("Characters", "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߩ<EFBFBD><EFBFBD>"); TQString characters = c->readEntry("Characters", "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߩ<EFBFBD><EFBFBD>");
// setup tqlayout // setup layout
TQHBoxLayout *_layout = new TQHBoxLayout(this); TQHBoxLayout *_layout = new TQHBoxLayout(this);
_layout->setAutoAdd(true); _layout->setAutoAdd(true);
@ -310,7 +310,7 @@ void CharTable::selectCell(int row, int col)
repaintCell(oldRow, oldCol); repaintCell(oldRow, oldCol);
repaintCell(_activeRow, _activeCol); repaintCell(_activeRow, _activeCol);
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
TQString text = TQString(_map[col + row * _cols]); TQString text = TQString(_map[col + row * _cols]);
bool oldMode = cb->selectionModeEnabled(); bool oldMode = cb->selectionModeEnabled();
@ -332,7 +332,7 @@ void CharTable::clearCell()
repaintCell(oldRow, oldCol); repaintCell(oldRow, oldCol);
TQObject::disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
} }

22
kcalc/kcalc.cpp
Unescape View File

@ -246,14 +246,14 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
mainLayout->addLayout(topLayout); mainLayout->addLayout(topLayout);
mainLayout->addLayout(btnLayout); mainLayout->addLayout(btnLayout);
// button tqlayout // button layout
btnLayout->addWidget(mSmallPage, 0, AlignTop); btnLayout->addWidget(mSmallPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing); btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mNumericPage, 0, AlignTop); btnLayout->addWidget(mNumericPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing); btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mLargePage, 0, AlignTop); btnLayout->addWidget(mLargePage, 0, AlignTop);
// small button tqlayout // small button layout
smallBtnLayout->addWidget(pbStat["NumData"], 0, 0); smallBtnLayout->addWidget(pbStat["NumData"], 0, 0);
smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1); smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1);
smallBtnLayout->addWidget(pbLogic["AND"], 0, 2); smallBtnLayout->addWidget(pbLogic["AND"], 0, 2);
@ -303,7 +303,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
smallBtnLayout->setRowStretch(4, 0); smallBtnLayout->setRowStretch(4, 0);
smallBtnLayout->setRowStretch(5, 0); smallBtnLayout->setRowStretch(5, 0);
// large button tqlayout // large button layout
largeBtnLayout->addWidget(pbClear, 0, 0); largeBtnLayout->addWidget(pbClear, 0, 0);
largeBtnLayout->addWidget(pbAC, 0, 1); largeBtnLayout->addWidget(pbAC, 0, 1);
@ -319,7 +319,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
largeBtnLayout->addWidget(pbPercent, 4, 0); largeBtnLayout->addWidget(pbPercent, 4, 0);
largeBtnLayout->addWidget(pbPlusMinus, 4, 1); largeBtnLayout->addWidget(pbPlusMinus, 4, 1);
// top tqlayout // top layout
topLayout->addWidget(pbAngleChoose); topLayout->addWidget(pbAngleChoose);
topLayout->addWidget(BaseChooseGroup); topLayout->addWidget(BaseChooseGroup);
topLayout->addStretch(); topLayout->addStretch();
@ -608,7 +608,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0, TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0,
mInternalSpacing); mInternalSpacing);
// large button tqlayout // large button layout
thisLayout->addWidget(pbEE, 0, 0); thisLayout->addWidget(pbEE, 0, 0);
thisLayout->addWidget(pbDivision, 0, 1); thisLayout->addWidget(pbDivision, 0, 1);
thisLayout->addWidget(pbX, 0, 2); thisLayout->addWidget(pbX, 0, 2);
@ -1049,7 +1049,7 @@ void KCalculator::updateGeometry(void)
if( o->isWidgetType() ) if( o->isWidgetType() )
{ {
TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o); TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o);
margin = TQApplication::tqstyle(). margin = TQApplication::style().
pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2; pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
tmp_widget->setFixedSize(s.width()+margin, s.height()+margin); tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
//tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin); //tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
@ -1063,7 +1063,7 @@ void KCalculator::updateGeometry(void)
int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height(); int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 ); int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
s.setWidth(mLargePage->fontMetrics().width("MMM") + s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle(). TQApplication::style().
pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2); s.setHeight(h1 + h2);
@ -1090,7 +1090,7 @@ void KCalculator::updateGeometry(void)
h1 = (NumButtonGroup->find(0x0F))->minimumSize().height(); h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
h2 = (int)((((float)h1 + 4.0) / 5.0)); h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") + s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle(). TQApplication::style().
pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2); s.setHeight(h1 + h2);
@ -2139,7 +2139,7 @@ void KCalculator::set_colors()
calc_display->changeSettings(); calc_display->changeSettings();
TQColor bg = tqpalette().active().background(); TQColor bg = palette().active().background();
TQPalette numPal(KCalcSettings::numberButtonsColor(), bg); TQPalette numPal(KCalcSettings::numberButtonsColor(), bg);
for(int i=0; i<10; i++) for(int i=0; i<10; i++)
@ -2212,7 +2212,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
if((num_but = NumButtonGroup->id((KCalcButton*)o)) if((num_but = NumButtonGroup->id((KCalcButton*)o))
!= -1) != -1)
{ {
TQPalette pal(c, tqpalette().active().background()); TQPalette pal(c, palette().active().background());
// Was it hex-button or normal digit?? // Was it hex-button or normal digit??
if (num_but <10) if (num_but <10)
@ -2243,7 +2243,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
else else
return false; return false;
TQPalette pal(c, tqpalette().active().background()); TQPalette pal(c, palette().active().background());
for(KCalcButton *p = list->first(); p; p=list->next()) for(KCalcButton *p = list->first(); p; p=list->next())
p->setPalette(pal); p->setPalette(pal);

2
kcalc/kcalc.kcfg
Unescape View File

@ -18,7 +18,7 @@
</entry> </entry>
<entry name="NumberButtonsColor" type="Color"> <entry name="NumberButtonsColor" type="Color">
<label>The color of number buttons.</label> <label>The color of number buttons.</label>
<code>QColor defaultButtonColor = kapp->tqpalette().active().background();</code> <code>QColor defaultButtonColor = kapp->palette().active().background();</code>
<default code="true">defaultButtonColor</default> <default code="true">defaultButtonColor</default>
</entry> </entry>
<entry name="FunctionButtonsColor" type="Color"> <entry name="FunctionButtonsColor" type="Color">

6
kcalc/kcalcdisplay.cpp
Unescape View File

@ -105,13 +105,13 @@ void KCalcDisplay::slotCopy(void)
TQString txt = TQLabel::text(); TQString txt = TQLabel::text();
if (_num_base == NB_HEX) if (_num_base == NB_HEX)
txt.prepend( "0x" ); txt.prepend( "0x" );
(TQApplication::tqclipboard())->setText(txt, TQClipboard::Clipboard); (TQApplication::clipboard())->setText(txt, TQClipboard::Clipboard);
(TQApplication::tqclipboard())->setText(txt, TQClipboard::Selection); (TQApplication::clipboard())->setText(txt, TQClipboard::Selection);
} }
void KCalcDisplay::slotPaste(bool bClipboard) void KCalcDisplay::slotPaste(bool bClipboard)
{ {
TQString tmp_str = (TQApplication::tqclipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection); TQString tmp_str = (TQApplication::clipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
if (tmp_str.isNull()) if (tmp_str.isNull())
{ {

16
kcharselect/kcharselectdia.cc
Unescape View File

@ -148,7 +148,7 @@ void KCharSelectDia::add(const TQChar &_chr)
//================================================================== //==================================================================
void KCharSelectDia::toClip() void KCharSelectDia::toClip()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setSelectionMode( true ); cb->setSelectionMode( true );
cb->setText(lined->text()); cb->setText(lined->text());
cb->setSelectionMode( false ); cb->setSelectionMode( false );
@ -161,7 +161,7 @@ void KCharSelectDia::toClip()
// //
void KCharSelectDia::toClipUTF8() void KCharSelectDia::toClipUTF8()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQString str = lined->text(); TQString str = lined->text();
cb->setText(str.utf8()); cb->setText(str.utf8());
} }
@ -174,7 +174,7 @@ void KCharSelectDia::toClipUTF8()
// //
void KCharSelectDia::toClipHTML() void KCharSelectDia::toClipHTML()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQString input; TQString input;
TQString html; TQString html;
TQString tempstring; TQString tempstring;
@ -185,13 +185,13 @@ void KCharSelectDia::toClipHTML()
for(i=0; i< input.length(); i++ ) for(i=0; i< input.length(); i++ )
{ {
tempchar = input.at(i); tempchar = input.at(i);
if( tempchar.latin1() && ((tempchar.tqunicode() < 128) || (tempchar.tqunicode() >= 128+32)) ) if( tempchar.latin1() && ((tempchar.unicode() < 128) || (tempchar.unicode() >= 128+32)) )
{ {
html.append(input.at(i)); html.append(input.at(i));
} }
else else
{ {
html.append(tempstring.sprintf("&#x%x;", tempchar.tqunicode())); html.append(tempstring.sprintf("&#x%x;", tempchar.unicode()));
} }
} }
cb->setText(html); cb->setText(html);
@ -201,7 +201,7 @@ void KCharSelectDia::toClipHTML()
// //
void KCharSelectDia::fromClip() void KCharSelectDia::fromClip()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
lined->setText( cb->text() ); lined->setText( cb->text() );
} }
@ -213,7 +213,7 @@ void KCharSelectDia::fromClip()
// //
void KCharSelectDia::fromClipUTF8() void KCharSelectDia::fromClipUTF8()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQString str = cb->text(); TQString str = cb->text();
lined->setText( str.fromUtf8( str.latin1() ) ); lined->setText( str.fromUtf8( str.latin1() ) );
@ -266,7 +266,7 @@ void KCharSelectDia::_exit()
config->setGroup("General"); config->setGroup("General");
config->writeEntry("selectedFont",vFont); config->writeEntry("selectedFont",vFont);
config->writeEntry("char",static_cast<int>(vChr.tqunicode())); config->writeEntry("char",static_cast<int>(vChr.unicode()));
config->writeEntry("table",charSelect->tableNum()); config->writeEntry("table",charSelect->tableNum());
config->writeEntry("entryDirection",entryDirection); config->writeEntry("entryDirection",entryDirection);
config->sync(); config->sync();

14
kdelirc/kcmlirc/addactionbase.ui
Unescape View File

@ -65,7 +65,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -229,7 +229,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -414,7 +414,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -512,7 +512,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout37</cstring> <cstring>layout37</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -677,7 +677,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout35</cstring> <cstring>layout35</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -685,7 +685,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout34</cstring> <cstring>layout34</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1218,7 +1218,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

6
kdelirc/kcmlirc/editactionbase.ui
Unescape View File

@ -56,7 +56,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout40</cstring> <cstring>layout40</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -242,7 +242,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout36</cstring> <cstring>layout36</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -542,7 +542,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout17</cstring> <cstring>layout17</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

6
kdelirc/kcmlirc/editmodebase.ui
Unescape View File

@ -43,7 +43,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout25</cstring> <cstring>layout25</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -62,7 +62,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout24</cstring> <cstring>layout24</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -215,7 +215,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

8
kdelirc/kcmlirc/kcmlircbase.ui
Unescape View File

@ -204,7 +204,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -300,7 +300,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -325,7 +325,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -429,7 +429,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

4
kdelirc/kcmlirc/newmode.ui
Unescape View File

@ -40,7 +40,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -77,7 +77,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
kdelirc/kcmlirc/selectprofile.ui
Unescape View File

@ -54,7 +54,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout47</cstring> <cstring>layout47</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
kedit/kedit.cpp
Unescape View File

@ -1204,7 +1204,7 @@ void TopLevel::timer_slot(){
void TopLevel::set_colors() void TopLevel::set_colors()
{ {
TQPalette mypalette = TQPalette((eframe->tqpalette())); TQPalette mypalette = TQPalette((eframe->palette()));
TQColorGroup ncgrp( mypalette.active() ); TQColorGroup ncgrp( mypalette.active() );

2
kgpg/conf_encryption.ui
Unescape View File

@ -111,7 +111,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4"> <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
kgpg/conf_gpg.ui
Unescape View File

@ -166,7 +166,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

2
kgpg/conf_servers.ui
Unescape View File

@ -82,7 +82,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="4" column="0"> <widget class="TQLayoutWidget" row="4" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

6
kgpg/keyproperties.ui
Unescape View File

@ -32,7 +32,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="3" rowspan="7" colspan="1"> <widget class="TQLayoutWidget" row="0" column="3" rowspan="7" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout39</cstring> <cstring>layout39</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -92,7 +92,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -117,7 +117,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="7" column="3" rowspan="4" colspan="1"> <widget class="TQLayoutWidget" row="7" column="3" rowspan="4" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

24
kgpg/kgpg.cpp
Unescape View File

@ -121,13 +121,13 @@ void MyView::clipEncrypt()
void MyView::clipDecrypt() void MyView::clipDecrypt()
{ {
TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
droppedtext(clippie,false); droppedtext(clippie,false);
} }
void MyView::clipSign(bool openEditor) void MyView::clipSign(bool openEditor)
{ {
TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
if (!clippie.isEmpty()) { if (!clippie.isEmpty()) {
KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
@ -302,8 +302,8 @@ void MyView::shredDroppedFile()
KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel); KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel);
TQWidget *page = new TQWidget(shredConfirm); TQWidget *page = new TQWidget(shredConfirm);
shredConfirm->setMainWidget(page); shredConfirm->setMainWidget(page);
TQBoxLayout *tqlayout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0); TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
(void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page); (void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page);
KListBox *lb=new KListBox(page); KListBox *lb=new KListBox(page);
@ -560,7 +560,7 @@ void MyView::dropEvent (TQDropEvent *o)
droppedfile(list); droppedfile(list);
else if ( TQTextDrag::decode(o, text) ) else if ( TQTextDrag::decode(o, text) )
{ {
TQApplication::tqclipboard()->setText(text,clipboardMode); TQApplication::clipboard()->setText(text,clipboardMode);
droppedtext(text); droppedtext(text);
} }
} }
@ -569,7 +569,7 @@ void MyView::dropEvent (TQDropEvent *o)
void MyView::readOptions() void MyView::readOptions()
{ {
clipboardMode=TQClipboard::Clipboard; clipboardMode=TQClipboard::Clipboard;
if ( KGpgSettings::useMouseSelection() && kapp->tqclipboard()->supportsSelection()) if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection())
clipboardMode=TQClipboard::Selection; clipboardMode=TQClipboard::Selection;
if (KGpgSettings::firstRun()) { if (KGpgSettings::firstRun()) {
@ -804,7 +804,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
void kgpgapplet::checkMenu() void kgpgapplet::checkMenu()
{ {
KgpgDecryptClipboard->setEnabled(false); KgpgDecryptClipboard->setEnabled(false);
if ((kapp->tqclipboard()->text(w->clipboardMode).isEmpty())) if ((kapp->clipboard()->text(w->clipboardMode).isEmpty()))
{ {
KgpgEncryptClipboard->setEnabled(false); KgpgEncryptClipboard->setEnabled(false);
KgpgSignClipboard->setEnabled(false); KgpgSignClipboard->setEnabled(false);
@ -812,7 +812,7 @@ void kgpgapplet::checkMenu()
else else
{ {
KgpgEncryptClipboard->setEnabled(true); KgpgEncryptClipboard->setEnabled(true);
if (kapp->tqclipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
KgpgDecryptClipboard->setEnabled(true); KgpgDecryptClipboard->setEnabled(true);
KgpgSignClipboard->setEnabled(true); KgpgSignClipboard->setEnabled(true);
} }
@ -1008,7 +1008,7 @@ int KgpgAppletApp::newInstance()
void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
{ {
if (kapp->tqclipboard()->text(clipboardMode).isEmpty()) { if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
return; return;
} }
@ -1020,12 +1020,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
KgpgInterface *txtEncrypt=new KgpgInterface(); KgpgInterface *txtEncrypt=new KgpgInterface();
connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString))); connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString)));
connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip())); connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip()));
txtEncrypt->KgpgEncryptText(kapp->tqclipboard()->text(clipboardMode),selec,encryptOptions); txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
} }
void MyView::slotPassiveClip() void MyView::slotPassiveClip()
{ {
TQString newtxt=kapp->tqclipboard()->text(clipboardMode); TQString newtxt=kapp->clipboard()->text(clipboardMode);
if (newtxt.length()>300) if (newtxt.length()>300)
newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace()); newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace());
@ -1045,7 +1045,7 @@ pop = new KPassivePopup( this);
void MyView::slotSetClip(TQString newtxt) void MyView::slotSetClip(TQString newtxt)
{ {
if (newtxt.isEmpty()) return; if (newtxt.isEmpty()) return;
TQApplication::tqclipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only TQApplication::clipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only
} }

2
kgpg/kgpgeditor.cpp
Unescape View File

@ -314,7 +314,7 @@ void KgpgApp::slotFileSave()
TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii()); TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii());
// slotStatusMsg(i18n("Saving file...")); // slotStatusMsg(i18n("Saving file..."));
if (!checkEncoding(cod)) { if (!checkEncoding(cod)) {
KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every tqunicode character in it.")); KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every unicode character in it."));
return; return;
} }

2
kgpg/kgpginterface.cpp
Unescape View File

@ -664,7 +664,7 @@ Md5Widget::~Md5Widget()
void Md5Widget::slotApply() void Md5Widget::slotApply()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQString text; TQString text;
// Copy text from the clipboard (paste) // Copy text from the clipboard (paste)
text = cb->text(TQClipboard::Clipboard); text = cb->text(TQClipboard::Clipboard);

4
kgpg/kgpgview.cpp
Unescape View File

@ -195,7 +195,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
editor=new MyEditor(this); editor=new MyEditor(this);
windowAutoClose=true; windowAutoClose=true;
///// tqlayout ///// layout
TQVBoxLayout *vbox=new TQVBoxLayout(this,3); TQVBoxLayout *vbox=new TQVBoxLayout(this,3);
@ -214,7 +214,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified())); TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified()));
boutonbox->tqlayout(); boutonbox->layout();
editor->resize(editor->maximumSize()); editor->resize(editor->maximumSize());
vbox->addWidget(editor); vbox->addWidget(editor);
vbox->addWidget(boutonbox); vbox->addWidget(boutonbox);

2
kgpg/kgpgwizard.ui
Unescape View File

@ -313,7 +313,7 @@ Remember that if you download a file or open one in an editor, parts of the file
</spacer> </spacer>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
kgpg/listkeys.cpp
Unescape View File

@ -1593,7 +1593,7 @@ void listKeys::slotProcessExportMail(TQString keys)
void listKeys::slotProcessExportClip(TQString keys) void listKeys::slotProcessExportClip(TQString keys)
{ {
kapp->tqclipboard()->setText(keys,clipboardMode); kapp->clipboard()->setText(keys,clipboardMode);
} }
@ -2488,7 +2488,7 @@ void listKeys::slotPreImportKey()
connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned()));
} }
} else { } else {
TQString keystr = kapp->tqclipboard()->text(clipboardMode); TQString keystr = kapp->clipboard()->text(clipboardMode);
if (!keystr.isEmpty()) { if (!keystr.isEmpty()) {
changeMessage(i18n("Importing..."),0,true); changeMessage(i18n("Importing..."),0,true);
KgpgInterface *importKeyProcess=new KgpgInterface(); KgpgInterface *importKeyProcess=new KgpgInterface();

4
khexedit/bitswapwidget.cc
Unescape View File

@ -103,8 +103,8 @@ void CDigitLabel::drawContents( TQPainter *p )
} }
else else
{ {
p->fillRect( cr, tqpalette().active().base() ); p->fillRect( cr, palette().active().base() );
p->setPen( tqpalette().active().text() ); p->setPen( palette().active().text() );
} }
if( mDotPosition != 0 ) if( mDotPosition != 0 )

4
khexedit/hexbuffer.cc
Unescape View File

@ -580,9 +580,9 @@ bool CHexBuffer::hasFileName( void )
int CHexBuffer::setLayout( SDisplayLayout &tqlayout ) int CHexBuffer::setLayout( SDisplayLayout &layout )
{ {
mLayout = tqlayout; mLayout = layout;
mLayout.verify(); mLayout.verify();
if( mLayout.primaryMode == SDisplayLayout::textOnly ) if( mLayout.primaryMode == SDisplayLayout::textOnly )

6
khexedit/hexbuffer.h
Unescape View File

@ -1072,7 +1072,7 @@ class CHexBuffer : public TQByteArray
CHexBuffer( void ); CHexBuffer( void );
~CHexBuffer( void ); ~CHexBuffer( void );
int setLayout( SDisplayLayout &tqlayout ); int setLayout( SDisplayLayout &layout );
void setColor( SDisplayColor &color ); void setColor( SDisplayColor &color );
void setInputMode( SDisplayInputMode &mode ); void setInputMode( SDisplayInputMode &mode );
bool toggleEditor( void ); bool toggleEditor( void );
@ -1156,7 +1156,7 @@ class CHexBuffer : public TQByteArray
inline SCursorState &cursorState( void ); inline SCursorState &cursorState( void );
inline void valueOnCursor( TQByteArray &buf, uint size ); inline void valueOnCursor( TQByteArray &buf, uint size );
inline SFileState &fileState( void ); inline SFileState &fileState( void );
inline const SDisplayLayout &tqlayout( void ); inline const SDisplayLayout &layout( void );
inline const SDisplayInputMode &inputMode( void ); inline const SDisplayInputMode &inputMode( void );
inline TQPtrList<SCursorOffset> &bookmarkList( void ); inline TQPtrList<SCursorOffset> &bookmarkList( void );
@ -1417,7 +1417,7 @@ inline void CHexBuffer::valueOnCursor( TQByteArray &buf, uint size )
} }
inline const SDisplayLayout &CHexBuffer::tqlayout( void ) inline const SDisplayLayout &CHexBuffer::layout( void )
{ {
return( mLayout ); return( mLayout );
} }

222
khexedit/hexeditorwidget.cc
Unescape View File

@ -72,7 +72,7 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name )
this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
mHexView->setFocus(); mHexView->setFocus();
setBackgroundColor( tqpalette().active().base() ); setBackgroundColor( palette().active().base() );
mProgressBusy = false; mProgressBusy = false;
mGotoDialog = 0; mGotoDialog = 0;
@ -115,7 +115,7 @@ void CHexEditorWidget::initialize( void )
setFont( mDisplayState.font ); setFont( mDisplayState.font );
mHexView->setMisc( mDisplayState.misc ); mHexView->setMisc( mDisplayState.misc );
mHexView->setCursor( mDisplayState.cursor, false ); mHexView->setCursor( mDisplayState.cursor, false );
mHexView->setLayout( mDisplayState.tqlayout ); mHexView->setLayout( mDisplayState.layout );
mHexView->setInputMode( mDisplayState.input ); mHexView->setInputMode( mDisplayState.input );
mHexView->setInsertMode( mDisplayState.misc.insertMode ); mHexView->setInsertMode( mDisplayState.misc.insertMode );
} }
@ -123,25 +123,25 @@ void CHexEditorWidget::initialize( void )
void CHexEditorWidget::writeConfiguration( KConfig &config ) void CHexEditorWidget::writeConfiguration( KConfig &config )
{ {
SDisplayLayout &tqlayout = mDisplayState.tqlayout; SDisplayLayout &layout = mDisplayState.layout;
config.setGroup( "Display Options" ); config.setGroup( "Display Options" );
config.writeEntry( "PrimaryMode", tqlayout.primaryModeString() ); config.writeEntry( "PrimaryMode", layout.primaryModeString() );
config.writeEntry( "SecondaryMode", tqlayout.secondaryModeString() ); config.writeEntry( "SecondaryMode", layout.secondaryModeString() );
config.writeEntry( "OffsetMode", tqlayout.offsetModeString() ); config.writeEntry( "OffsetMode", layout.offsetModeString() );
config.writeEntry( "OffsetVisible", tqlayout.offsetVisible ); config.writeEntry( "OffsetVisible", layout.offsetVisible );
config.writeEntry( "PrimaryUpperCase", tqlayout.primaryUpperCase ); config.writeEntry( "PrimaryUpperCase", layout.primaryUpperCase );
config.writeEntry( "OffsetUpperCase", tqlayout.offsetUpperCase ); config.writeEntry( "OffsetUpperCase", layout.offsetUpperCase );
config.writeEntry( "LineSize", tqlayout.lineSize ); config.writeEntry( "LineSize", layout.lineSize );
config.writeEntry( "ColumnSize", tqlayout.columnSize ); config.writeEntry( "ColumnSize", layout.columnSize );
config.writeEntry( "LockLine", tqlayout.lockLine ); config.writeEntry( "LockLine", layout.lockLine );
config.writeEntry( "LockColumn", tqlayout.lockColumn ); config.writeEntry( "LockColumn", layout.lockColumn );
config.writeEntry( "ColumnCharSpace", tqlayout.columnCharSpace ); config.writeEntry( "ColumnCharSpace", layout.columnCharSpace );
config.writeEntry( "ColumnSpacing", tqlayout.columnSpacing ); config.writeEntry( "ColumnSpacing", layout.columnSpacing );
config.writeEntry( "SeparatorMarginWidth", tqlayout.separatorMarginWidth ); config.writeEntry( "SeparatorMarginWidth", layout.separatorMarginWidth );
config.writeEntry( "EdgeMarginWidth", tqlayout.edgeMarginWidth ); config.writeEntry( "EdgeMarginWidth", layout.edgeMarginWidth );
config.writeEntry( "LeftSeparatorWidth", tqlayout.leftSeparatorWidth ); config.writeEntry( "LeftSeparatorWidth", layout.leftSeparatorWidth );
config.writeEntry( "RightSeparatorWidth", tqlayout.rightSeparatorWidth ); config.writeEntry( "RightSeparatorWidth", layout.rightSeparatorWidth );
config.writeEntry( "GridMode", tqlayout.gridModeString() ); config.writeEntry( "GridMode", layout.gridModeString() );
SDisplayLine &line = mDisplayState.line; SDisplayLine &line = mDisplayState.line;
config.setGroup( "Line Size" ); config.setGroup( "Line Size" );
@ -183,7 +183,7 @@ void CHexEditorWidget::writeConfiguration( KConfig &config )
config.setGroup( "Display Font" ); config.setGroup( "Display Font" );
config.writeEntry( "UseSystemFont", font.useSystemFont ); config.writeEntry( "UseSystemFont", font.useSystemFont );
config.writeEntry( "LocalFont", font.localFont ); config.writeEntry( "LocalFont", font.localFont );
config.writeEntry( "NonPrintChar", font.nonPrintChar.tqunicode() ); config.writeEntry( "NonPrintChar", font.nonPrintChar.unicode() );
SDisplayCursor &cursor = mDisplayState.cursor; SDisplayCursor &cursor = mDisplayState.cursor;
config.setGroup( "Display Cursor" ); config.setGroup( "Display Cursor" );
@ -221,38 +221,38 @@ void CHexEditorWidget::writeConfiguration( KConfig &config )
void CHexEditorWidget::readConfiguration( KConfig &config ) void CHexEditorWidget::readConfiguration( KConfig &config )
{ {
SDisplayLayout &tqlayout = mDisplayState.tqlayout; SDisplayLayout &layout = mDisplayState.layout;
config.setGroup( "Display Options" ); config.setGroup( "Display Options" );
tqlayout.setPrimaryMode( config.readEntry("PrimaryMode") ); layout.setPrimaryMode( config.readEntry("PrimaryMode") );
tqlayout.setSecondaryMode( config.readEntry("SecondaryMode") ); layout.setSecondaryMode( config.readEntry("SecondaryMode") );
tqlayout.setOffsetMode( config.readEntry("OffsetMode") ); layout.setOffsetMode( config.readEntry("OffsetMode") );
tqlayout.offsetVisible = config.readBoolEntry( layout.offsetVisible = config.readBoolEntry(
"OffsetVisible", tqlayout.offsetVisible ); "OffsetVisible", layout.offsetVisible );
tqlayout.primaryUpperCase = config.readBoolEntry( layout.primaryUpperCase = config.readBoolEntry(
"PrimaryUpperCase", tqlayout.primaryUpperCase ); "PrimaryUpperCase", layout.primaryUpperCase );
tqlayout.offsetUpperCase = config.readBoolEntry( layout.offsetUpperCase = config.readBoolEntry(
"OffsetUpperCase", tqlayout.offsetUpperCase ); "OffsetUpperCase", layout.offsetUpperCase );
tqlayout.lineSize = config.readNumEntry( layout.lineSize = config.readNumEntry(
"LineSize", tqlayout.lineSize ); "LineSize", layout.lineSize );
tqlayout.columnSize = config.readNumEntry( layout.columnSize = config.readNumEntry(
"ColumnSize", tqlayout.columnSize ); "ColumnSize", layout.columnSize );
tqlayout.lockLine = config.readBoolEntry( layout.lockLine = config.readBoolEntry(
"LockLine", tqlayout.lockLine ); "LockLine", layout.lockLine );
tqlayout.lockColumn = config.readBoolEntry( layout.lockColumn = config.readBoolEntry(
"LockColumn", tqlayout.lockColumn ); "LockColumn", layout.lockColumn );
tqlayout.columnCharSpace = config.readBoolEntry( layout.columnCharSpace = config.readBoolEntry(
"ColumnCharSpace", tqlayout.columnCharSpace ); "ColumnCharSpace", layout.columnCharSpace );
tqlayout.columnSpacing = config.readNumEntry( layout.columnSpacing = config.readNumEntry(
"ColumnSpacing", tqlayout.columnSpacing ); "ColumnSpacing", layout.columnSpacing );
tqlayout.separatorMarginWidth = config.readNumEntry( layout.separatorMarginWidth = config.readNumEntry(
"SeparatorMarginWidth", tqlayout.separatorMarginWidth ); "SeparatorMarginWidth", layout.separatorMarginWidth );
tqlayout.edgeMarginWidth = config.readNumEntry( layout.edgeMarginWidth = config.readNumEntry(
"EdgeMarginWidth", tqlayout.edgeMarginWidth ); "EdgeMarginWidth", layout.edgeMarginWidth );
tqlayout.leftSeparatorWidth = config.readNumEntry( layout.leftSeparatorWidth = config.readNumEntry(
"LeftSeparatorWidth", tqlayout.leftSeparatorWidth ); "LeftSeparatorWidth", layout.leftSeparatorWidth );
tqlayout.rightSeparatorWidth = config.readNumEntry( layout.rightSeparatorWidth = config.readNumEntry(
"RightSeparatorWidth", tqlayout.rightSeparatorWidth ); "RightSeparatorWidth", layout.rightSeparatorWidth );
tqlayout.setGridMode( config.readEntry("GridMode") ); layout.setGridMode( config.readEntry("GridMode") );
SDisplayLine &line = mDisplayState.line; SDisplayLine &line = mDisplayState.line;
config.setGroup( "Line Size" ); config.setGroup( "Line Size" );
@ -398,9 +398,9 @@ void CHexEditorWidget::paletteChanged( void )
setColor( mDisplayState.color ); setColor( mDisplayState.color );
} }
void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ ) void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*layout*/ )
{ {
//mDisplayState.tqlayout = tqlayout; //mDisplayState.layout = layout;
} }
void CHexEditorWidget::inputModeChanged( const SDisplayInputMode &input ) void CHexEditorWidget::inputModeChanged( const SDisplayInputMode &input )
@ -414,30 +414,30 @@ void CHexEditorWidget::setLineSize(const SDisplayLine &line )
mDisplayState.line = line; mDisplayState.line = line;
} }
void CHexEditorWidget::setLayout( const SDisplayLayout &tqlayout ) void CHexEditorWidget::setLayout( const SDisplayLayout &layout )
{ {
// //
// We only set the values that can be modified by the dialog // We only set the values that can be modified by the dialog
// //
mDisplayState.tqlayout.lockLine = tqlayout.lockLine; mDisplayState.layout.lockLine = layout.lockLine;
mDisplayState.tqlayout.lockColumn = tqlayout.lockColumn; mDisplayState.layout.lockColumn = layout.lockColumn;
mDisplayState.tqlayout.leftSeparatorWidth = tqlayout.leftSeparatorWidth; mDisplayState.layout.leftSeparatorWidth = layout.leftSeparatorWidth;
mDisplayState.tqlayout.rightSeparatorWidth = tqlayout.rightSeparatorWidth; mDisplayState.layout.rightSeparatorWidth = layout.rightSeparatorWidth;
mDisplayState.tqlayout.separatorMarginWidth = tqlayout.separatorMarginWidth; mDisplayState.layout.separatorMarginWidth = layout.separatorMarginWidth;
mDisplayState.tqlayout.edgeMarginWidth = tqlayout.edgeMarginWidth; mDisplayState.layout.edgeMarginWidth = layout.edgeMarginWidth;
mDisplayState.tqlayout.columnCharSpace = tqlayout.columnCharSpace; mDisplayState.layout.columnCharSpace = layout.columnCharSpace;
mDisplayState.tqlayout.columnSpacing = tqlayout.columnSpacing; mDisplayState.layout.columnSpacing = layout.columnSpacing;
mDisplayState.tqlayout.horzGridWidth = tqlayout.horzGridWidth; mDisplayState.tqlayout.horzGridWidth = tqlayout.horzGridWidth;
mDisplayState.tqlayout.vertGridWidth = tqlayout.vertGridWidth; mDisplayState.layout.vertGridWidth = layout.vertGridWidth;
// //
// Select the line and column sizes we shall use now. // Select the line and column sizes we shall use now.
// //
SDisplayLayout &l = mDisplayState.tqlayout; SDisplayLayout &l = mDisplayState.layout;
l.lineSize = mDisplayState.line.lineSize[ l.primaryMode ]; l.lineSize = mDisplayState.line.lineSize[ l.primaryMode ];
l.columnSize = mDisplayState.line.columnSize[ l.primaryMode ]; l.columnSize = mDisplayState.line.columnSize[ l.primaryMode ];
mHexView->setLayout( mDisplayState.tqlayout ); mHexView->setLayout( mDisplayState.layout );
} }
void CHexEditorWidget::setCursor( const SDisplayCursor &cursor ) void CHexEditorWidget::setCursor( const SDisplayCursor &cursor )
@ -459,20 +459,20 @@ void CHexEditorWidget::setColor( const SDisplayColor &color )
if( mDisplayState.color.useSystemColor == true ) if( mDisplayState.color.useSystemColor == true )
{ {
SDisplayColor c = mDisplayState.color; SDisplayColor c = mDisplayState.color;
c.textBg = kapp->tqpalette().active().base(); c.textBg = kapp->palette().active().base();
c.secondTextBg = kapp->tqpalette().active().base(); c.secondTextBg = kapp->palette().active().base();
c.offsetBg = kapp->tqpalette().active().base(); c.offsetBg = kapp->palette().active().base();
c.inactiveBg = kapp->tqpalette().active().base(); c.inactiveBg = kapp->palette().active().base();
c.primaryFg[0] = kapp->tqpalette().active().text(); c.primaryFg[0] = kapp->palette().active().text();
c.primaryFg[1] = kapp->tqpalette().active().text(); c.primaryFg[1] = kapp->palette().active().text();
c.nonPrintFg = kapp->tqpalette().active().text(); c.nonPrintFg = kapp->palette().active().text();
c.offsetFg = kapp->tqpalette().active().text(); c.offsetFg = kapp->palette().active().text();
c.secondaryFg = kapp->tqpalette().active().text(); c.secondaryFg = kapp->palette().active().text();
c.leftSeparatorFg = kapp->tqpalette().active().text(); c.leftSeparatorFg = kapp->palette().active().text();
c.rightSeparatorFg = kapp->tqpalette().active().text(); c.rightSeparatorFg = kapp->palette().active().text();
c.cursorBg = kapp->tqpalette().active().text(); c.cursorBg = kapp->palette().active().text();
c.cursorFg = kapp->tqpalette().active().base(); c.cursorFg = kapp->palette().active().base();
c.gridFg = kapp->tqpalette().active().text(); c.gridFg = kapp->palette().active().text();
SDisplayColor defaultColor; SDisplayColor defaultColor;
c.bookmarkBg = defaultColor.bookmarkBg; c.bookmarkBg = defaultColor.bookmarkBg;
c.bookmarkFg = defaultColor.bookmarkFg; c.bookmarkFg = defaultColor.bookmarkFg;
@ -513,46 +513,46 @@ void CHexEditorWidget::setMisc( const SDisplayMisc &misc )
void CHexEditorWidget::setHexadecimalMode( void ) void CHexEditorWidget::setHexadecimalMode( void )
{ {
tqlayout().primaryMode = SDisplayLayout::hexadecimal; layout().primaryMode = SDisplayLayout::hexadecimal;
tqlayout().lineSize = line().lineSize[ SDisplayLine::hexadecimal ]; layout().lineSize = line().lineSize[ SDisplayLine::hexadecimal ];
tqlayout().columnSize = line().columnSize[ SDisplayLine::hexadecimal ]; layout().columnSize = line().columnSize[ SDisplayLine::hexadecimal ];
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::setDecimalMode( void ) void CHexEditorWidget::setDecimalMode( void )
{ {
tqlayout().primaryMode = SDisplayLayout::decimal; layout().primaryMode = SDisplayLayout::decimal;
tqlayout().lineSize = line().lineSize[ SDisplayLine::decimal ]; layout().lineSize = line().lineSize[ SDisplayLine::decimal ];
tqlayout().columnSize = line().columnSize[ SDisplayLine::decimal ]; layout().columnSize = line().columnSize[ SDisplayLine::decimal ];
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::setOctalMode( void ) void CHexEditorWidget::setOctalMode( void )
{ {
tqlayout().primaryMode = SDisplayLayout::octal; layout().primaryMode = SDisplayLayout::octal;
tqlayout().lineSize = line().lineSize[ SDisplayLine::octal ]; layout().lineSize = line().lineSize[ SDisplayLine::octal ];
tqlayout().columnSize = line().columnSize[ SDisplayLine::octal ]; layout().columnSize = line().columnSize[ SDisplayLine::octal ];
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::setBinaryMode( void ) void CHexEditorWidget::setBinaryMode( void )
{ {
tqlayout().primaryMode = SDisplayLayout::binary; layout().primaryMode = SDisplayLayout::binary;
tqlayout().lineSize = line().lineSize[ SDisplayLine::binary ]; layout().lineSize = line().lineSize[ SDisplayLine::binary ];
tqlayout().columnSize = line().columnSize[ SDisplayLine::binary ]; layout().columnSize = line().columnSize[ SDisplayLine::binary ];
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::setTextMode( void ) void CHexEditorWidget::setTextMode( void )
{ {
tqlayout().primaryMode = SDisplayLayout::textOnly; layout().primaryMode = SDisplayLayout::textOnly;
tqlayout().lineSize = line().lineSize[ SDisplayLine::textOnly ]; layout().lineSize = line().lineSize[ SDisplayLine::textOnly ];
tqlayout().columnSize = line().columnSize[ SDisplayLine::textOnly ]; layout().columnSize = line().columnSize[ SDisplayLine::textOnly ];
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
@ -1306,34 +1306,34 @@ void CHexEditorWidget::enableInputLock( bool inputLock )
void CHexEditorWidget::toggleOffsetColumnVisibility( void ) void CHexEditorWidget::toggleOffsetColumnVisibility( void )
{ {
tqlayout().offsetVisible = tqlayout().offsetVisible == true ? false : true; layout().offsetVisible = layout().offsetVisible == true ? false : true;
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::toggleTextColumnVisibility( void ) void CHexEditorWidget::toggleTextColumnVisibility( void )
{ {
tqlayout().secondaryMode = tqlayout().secondaryMode == SDisplayLayout::hide ? layout().secondaryMode = layout().secondaryMode == SDisplayLayout::hide ?
SDisplayLayout::textOnly : SDisplayLayout::hide; SDisplayLayout::textOnly : SDisplayLayout::hide;
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::toggleOffsetAsDecimal( void ) void CHexEditorWidget::toggleOffsetAsDecimal( void )
{ {
tqlayout().offsetMode = tqlayout().offsetMode == SDisplayLayout::hexadecimal ? layout().offsetMode = layout().offsetMode == SDisplayLayout::hexadecimal ?
SDisplayLayout::decimal : SDisplayLayout::hexadecimal; SDisplayLayout::decimal : SDisplayLayout::hexadecimal;
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::toggleDataUppercase( void ) void CHexEditorWidget::toggleDataUppercase( void )
{ {
tqlayout().primaryUpperCase = tqlayout().primaryUpperCase == true ? false : true; layout().primaryUpperCase = layout().primaryUpperCase == true ? false : true;
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::toggleOffsetUppercase( void ) void CHexEditorWidget::toggleOffsetUppercase( void )
{ {
tqlayout().offsetUpperCase = tqlayout().offsetUpperCase == true ? false : true; layout().offsetUpperCase = layout().offsetUpperCase == true ? false : true;
mHexView->setLayout( tqlayout() ); mHexView->setLayout( layout() );
} }
void CHexEditorWidget::toggleInsertMode( void ) void CHexEditorWidget::toggleInsertMode( void )
@ -1958,7 +1958,7 @@ void CHexEditorWidget::favorites( void )
{ {
TQString msg = i18n("" TQString msg = i18n(""
"Not available yet!\n" "Not available yet!\n"
"Save or retrive your favorite tqlayout" ); "Save or retrive your favorite layout" );
KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") );
} }

10
khexedit/hexeditorwidget.h
Unescape View File

@ -83,7 +83,7 @@ class CHexEditorWidget : public TQWidget
inline int defaultTextWidth( void ); inline int defaultTextWidth( void );
inline CHexViewWidget *view( void ); inline CHexViewWidget *view( void );
inline SDisplayLayout &tqlayout( void ); inline SDisplayLayout &layout( void );
inline SDisplayLine &line( void ); inline SDisplayLine &line( void );
inline SDisplayInputMode &inputMode( void ); inline SDisplayInputMode &inputMode( void );
inline SDisplayMisc::EOpenFile openFile( void ); inline SDisplayMisc::EOpenFile openFile( void );
@ -170,10 +170,10 @@ class CHexEditorWidget : public TQWidget
protected slots: protected slots:
void fontChanged( void ); void fontChanged( void );
void paletteChanged( void ); void paletteChanged( void );
void layoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &layout );
void inputModeChanged( const SDisplayInputMode &input ); void inputModeChanged( const SDisplayInputMode &input );
void setLineSize(const SDisplayLine &line ); void setLineSize(const SDisplayLine &line );
void setLayout( const SDisplayLayout &tqlayout ); void setLayout( const SDisplayLayout &layout );
void setCursor( const SDisplayCursor &cursor ); void setCursor( const SDisplayCursor &cursor );
void setColor( const SDisplayColor &color ); void setColor( const SDisplayColor &color );
void setFont( const SDisplayFont &font ); void setFont( const SDisplayFont &font );
@ -259,9 +259,9 @@ inline CHexViewWidget *CHexEditorWidget::view( void )
return( mHexView ); return( mHexView );
} }
inline SDisplayLayout &CHexEditorWidget::tqlayout( void ) inline SDisplayLayout &CHexEditorWidget::layout( void )
{ {
return( mDisplayState.tqlayout ); return( mDisplayState.layout );
} }
inline SDisplayLine &CHexEditorWidget::line( void ) inline SDisplayLine &CHexEditorWidget::line( void )

2
khexedit/hexeditstate.h
Unescape View File

@ -574,7 +574,7 @@ class SDisplayState
{ {
public: public:
SDisplayLine line; SDisplayLine line;
SDisplayLayout tqlayout; SDisplayLayout layout;
SDisplayCursor cursor; SDisplayCursor cursor;
SDisplayColor color; SDisplayColor color;
SDisplayFont font; SDisplayFont font;

2
khexedit/hexmanagerwidget.cc
Unescape View File

@ -70,7 +70,7 @@ void CHexManagerWidget::updateLayout( void )
{ {
if( mValid == false ) { return; } if( mValid == false ) { return; }
delete tqlayout(); delete layout();
TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, 0 ); TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, 0 );
if( mSearchBar && mSearchBarPosition == AboveEditor ) if( mSearchBar && mSearchBarPosition == AboveEditor )

20
khexedit/hexviewwidget.cc
Unescape View File

@ -438,7 +438,7 @@ void CHexViewWidget::changeYPos( int p )
void CHexViewWidget::clipboardChanged( void ) void CHexViewWidget::clipboardChanged( void )
{ {
disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
this,TQT_SLOT(clipboardChanged())); this,TQT_SLOT(clipboardChanged()));
unselect(); unselect();
} }
@ -716,9 +716,9 @@ void CHexViewWidget::setPalette( const TQPalette &p )
} }
void CHexViewWidget::setLayout( SDisplayLayout &tqlayout ) void CHexViewWidget::setLayout( SDisplayLayout &layout )
{ {
mLayout = tqlayout; mLayout = layout;
mHexBuffer->setLayout( mLayout ); mHexBuffer->setLayout( mLayout );
updateWindow(); updateWindow();
@ -964,7 +964,7 @@ void CHexViewWidget::copy( void )
{ {
return; return;
} }
disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
this,TQT_SLOT(clipboardChanged())); this,TQT_SLOT(clipboardChanged()));
// //
// Note: Do no give the CHexDrag a parent != 0. The clipboard // Note: Do no give the CHexDrag a parent != 0. The clipboard
@ -974,8 +974,8 @@ void CHexViewWidget::copy( void )
// is destroyed. We will then have a double destroy situation // is destroyed. We will then have a double destroy situation
// when the app. is closed (=> segfault). // when the app. is closed (=> segfault).
// //
TQApplication::tqclipboard()->setData(new CHexDrag( buf )); TQApplication::clipboard()->setData(new CHexDrag( buf ));
connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
this,TQT_SLOT(clipboardChanged())); this,TQT_SLOT(clipboardChanged()));
} }
@ -988,10 +988,10 @@ void CHexViewWidget::copyText( int columnSegment )
return; return;
} }
disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
this,TQT_SLOT(clipboardChanged())); this,TQT_SLOT(clipboardChanged()));
TQApplication::tqclipboard()->setText( buf.data() ); TQApplication::clipboard()->setText( buf.data() );
connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
this,TQT_SLOT(clipboardChanged())); this,TQT_SLOT(clipboardChanged()));
} }
@ -999,7 +999,7 @@ void CHexViewWidget::copyText( int columnSegment )
void CHexViewWidget::paste( void ) void CHexViewWidget::paste( void )
{ {
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if( data != 0 ) if( data != 0 )
{ {
TQByteArray buf; TQByteArray buf;

4
khexedit/hexviewwidget.h
Unescape View File

@ -140,7 +140,7 @@ class CHexViewWidget : public TQFrame
virtual void setPalette( const TQPalette & ); virtual void setPalette( const TQPalette & );
void setInputMode( SDisplayInputMode &mode ); void setInputMode( SDisplayInputMode &mode );
void setLayout( SDisplayLayout &tqlayout ); void setLayout( SDisplayLayout &layout );
void setCursor( const SDisplayCursor &cursor, bool updateDisplay ); void setCursor( const SDisplayCursor &cursor, bool updateDisplay );
void setColor( const SDisplayColor &color, bool updateDisplay ); void setColor( const SDisplayColor &color, bool updateDisplay );
void setFont( const SDisplayFontInfo &fontInfo, bool updateDisplay ); void setFont( const SDisplayFontInfo &fontInfo, bool updateDisplay );
@ -218,7 +218,7 @@ class CHexViewWidget : public TQFrame
void cursorChanged( SCursorState &state ); void cursorChanged( SCursorState &state );
void fileState( SFileState &state ); void fileState( SFileState &state );
void dataChanged( void ); void dataChanged( void );
void layoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &layout );
void inputModeChanged( const SDisplayInputMode &mode ); void inputModeChanged( const SDisplayInputMode &mode );
void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void bookmarkChanged( TQPtrList<SCursorOffset> &list );
void editMode( CHexBuffer::EEditMode editMode ); void editMode( CHexBuffer::EEditMode editMode );

2
khexedit/lib/codecs/kebcdic1047charcodec.cpp
Unescape View File

@ -98,7 +98,7 @@ static const char KEBCDIC1047CharCodecName[] = "EBCDIC 1047";
bool KEBCDIC1047CharCodec::encode( char *D, const TQChar &C ) const bool KEBCDIC1047CharCodec::encode( char *D, const TQChar &C ) const
{ {
int I = C.tqunicode(); int I = C.unicode();
// not in range? // not in range?
if( 0x00FF < I ) if( 0x00FF < I )
return false; return false;

4
khexedit/lib/codecs/ktextcharcodec.h
Unescape View File

@ -51,9 +51,9 @@ class KTextCharCodec : public KCharCodec
protected: protected:
TQTextCodec *Codec; TQTextCodec *Codec;
/** decodes the chars to tqunicode */ /** decodes the chars to unicode */
TQTextDecoder *Decoder; TQTextDecoder *Decoder;
/** encodes the chars from tqunicode */ /** encodes the chars from unicode */
TQTextEncoder *Encoder; TQTextEncoder *Encoder;
/** */ /** */
mutable TQString Name; mutable TQString Name;

4
khexedit/lib/kbordercolumn.cpp
Unescape View File

@ -49,7 +49,7 @@ void KBorderColumn::paintLine( TQPainter *P )
if( Middle ) if( Middle )
{ {
int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View ); int GridColor = View->style().styleHint( TQStyle::SH_Table_GridLineColor, View );
P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
P->drawLine( LineX, 0, LineX, LineHeight-1 ) ; P->drawLine( LineX, 0, LineX, LineHeight-1 ) ;
} }
@ -75,7 +75,7 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
KPixelX LX = x() + LineX; KPixelX LX = x() + LineX;
if( Middle && Xs.includes(LX) ) if( Middle && Xs.includes(LX) )
{ {
int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View ); int GridColor = View->style().styleHint( TQStyle::SH_Table_GridLineColor, View );
P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
P->drawLine( LX, Ys.start(), LX, Ys.end() ) ; P->drawLine( LX, Ys.start(), LX, Ys.end() ) ;
} }

2
khexedit/lib/kbuffercoltextexport.cpp
Unescape View File

@ -38,7 +38,7 @@ KBufferColTextExport::KBufferColTextExport( const KBufferColumn* BufferColumn, c
: Data( D ), : Data( D ),
CoordRange( CR ) CoordRange( CR )
{ {
NoOfBytesPerLine = BufferColumn->tqlayout()->noOfBytesPerLine(); NoOfBytesPerLine = BufferColumn->layout()->noOfBytesPerLine();
Pos = new int[NoOfBytesPerLine]; Pos = new int[NoOfBytesPerLine];
// TODO: remove this hack and make it more general // TODO: remove this hack and make it more general

8
khexedit/lib/kbuffercolumn.h
Unescape View File

@ -39,7 +39,7 @@ class KCharCodec;
const int NoByteFound = -1; const int NoByteFound = -1;
/** base class of all buffer column displayers /** base class of all buffer column displayers
* holds all information about the vertical tqlayout of a buffer column * holds all information about the vertical layout of a buffer column
* knows how to paint the data and the editing things (focus, cursor, selection) * knows how to paint the data and the editing things (focus, cursor, selection)
* but does not offer * but does not offer
* *
@ -154,7 +154,7 @@ class KBufferColumn : public KColumn
int firstPos() const; int firstPos() const;
int lastPos() const; int lastPos() const;
KSection visiblePositions() const; KSection visiblePositions() const;
const KBufferLayout *tqlayout() const; const KBufferLayout *layout() const;
KCharCodec* codec() const; KCharCodec* codec() const;
protected: protected:
@ -184,7 +184,7 @@ class KBufferColumn : public KColumn
protected: protected:
/** pointer to the buffer */ /** pointer to the buffer */
KDataBuffer *Buffer; KDataBuffer *Buffer;
/** pointer to the tqlayout */ /** pointer to the layout */
const KBufferLayout *Layout; const KBufferLayout *Layout;
/** pointer to the ranges */ /** pointer to the ranges */
KBufferRanges *Ranges; KBufferRanges *Ranges;
@ -242,7 +242,7 @@ inline int KBufferColumn::firstPos() const { return PaintPositions.start(); }
inline int KBufferColumn::lastPos() const { return PaintPositions.end(); } inline int KBufferColumn::lastPos() const { return PaintPositions.end(); }
inline KSection KBufferColumn::visiblePositions() const { return PaintPositions; } inline KSection KBufferColumn::visiblePositions() const { return PaintPositions; }
inline const KBufferLayout *KBufferColumn::tqlayout() const { return Layout; } inline const KBufferLayout *KBufferColumn::layout() const { return Layout; }
inline void KBufferColumn::setCodec( KCharCodec *C ) { Codec = C; } inline void KBufferColumn::setCodec( KCharCodec *C ) { Codec = C; }

8
khexedit/lib/kbuffercursor.h
Unescape View File

@ -27,10 +27,10 @@ namespace KHE
class KBufferLayout; class KBufferLayout;
/**@short navigates through the buffer in an abstract way, based on the tqlayout /**@short navigates through the buffer in an abstract way, based on the layout
* *
* The cursor is allowed to access every coord that has content as * The cursor is allowed to access every coord that has content as
* described in the tqlayout. It holds the coord of the actual position * described in the layout. It holds the coord of the actual position
* and the according index in the data array. * and the according index in the data array.
* *
* To enable the cursor to be placed behind the last position in a line * To enable the cursor to be placed behind the last position in a line
@ -138,7 +138,7 @@ class KBufferCursor
void stepToEnd(); void stepToEnd();
private: private:
/** tqlayout, tells how the column is organized */ /** layout, tells how the column is organized */
const KBufferLayout *Layout; const KBufferLayout *Layout;
/** Position in buffer */ /** Position in buffer */
@ -151,7 +151,7 @@ class KBufferCursor
*/ */
bool Behind : 1; bool Behind : 1;
/** tells whether there could be a position behind the end of the tqlayout */ /** tells whether there could be a position behind the end of the layout */
bool AppendPosEnabled : 1; bool AppendPosEnabled : 1;
}; };

6
khexedit/lib/kbufferlayout.h
Unescape View File

@ -24,7 +24,7 @@
namespace KHE { namespace KHE {
/**@short the logical tqlayout of a plain buffer view /**@short the logical layout of a plain buffer view
* *
* Given the values for * Given the values for
* * length of the buffer, * * length of the buffer,
@ -38,7 +38,7 @@ namespace KHE {
* * final position in this line, and * * final position in this line, and
* * the total number of lines (is final line +1 or 0) * * the total number of lines (is final line +1 or 0)
* *
* This tqlayout sees the buffer as a continous stream of byte, * This layout sees the buffer as a continous stream of byte,
* thus uses each line after the start from the begin to the end. * thus uses each line after the start from the begin to the end.
* *
* If the buffer is empty the end coord will be set one pos left to the start coord * If the buffer is empty the end coord will be set one pos left to the start coord
@ -75,7 +75,7 @@ class KBufferLayout
/** returns the coord of the end */ /** returns the coord of the end */
KBufferCoord final() const; KBufferCoord final() const;
/** tells how much lines this tqlayout needs (incl. blank leading lines due to StartOffset) */ /** tells how much lines this layout needs (incl. blank leading lines due to StartOffset) */
int noOfLines() const; int noOfLines() const;

26
khexedit/lib/khexedit.cpp
Unescape View File

@ -94,7 +94,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl
InZooming( false ), InZooming( false ),
d( 0 ) d( 0 )
{ {
// initalize tqlayout // initalize layout
if( DataBuffer ) if( DataBuffer )
BufferLayout->setLength( DataBuffer->size() ); BufferLayout->setLength( DataBuffer->size() );
BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() ); BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() );
@ -558,7 +558,7 @@ TQSize KHexEdit::minimumSizeHint() const
{ {
// TODO: better minimal width (visibility!) // TODO: better minimal width (visibility!)
return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(), return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(),
lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 ); lineHeight() + noOfLines()>1? style().pixelMetric(TQStyle::PM_ScrollBarExtent):0 );
} }
@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const
// check influence of dis-/appearing of the vertical scrollbar // check influence of dis-/appearing of the vertical scrollbar
bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible(); bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible();
KPixelX ScrollbarExtent = tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); KPixelX ScrollbarExtent = style().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
KPixelX AvailableWidth = FullWidth; KPixelX AvailableWidth = FullWidth;
if( VerticalScrollbarIsVisible ) if( VerticalScrollbarIsVisible )
@ -850,7 +850,7 @@ void KHexEdit::cut()
if( !Drag ) if( !Drag )
return; return;
TQApplication::tqclipboard()->setData( Drag, ClipboardMode ); TQApplication::clipboard()->setData( Drag, ClipboardMode );
removeSelectedData(); removeSelectedData();
} }
@ -862,7 +862,7 @@ void KHexEdit::copy()
if( !Drag ) if( !Drag )
return; return;
TQApplication::tqclipboard()->setData( Drag, ClipboardMode ); TQApplication::clipboard()->setData( Drag, ClipboardMode );
} }
@ -871,7 +871,7 @@ void KHexEdit::paste()
if( isReadOnly() ) if( isReadOnly() )
return; return;
TQMimeSource *Source = TQApplication::tqclipboard()->data( ClipboardMode ); TQMimeSource *Source = TQApplication::clipboard()->data( ClipboardMode );
pasteFromSource( Source ); pasteFromSource( Source );
} }
@ -1042,7 +1042,7 @@ void KHexEdit::updateLength()
void KHexEdit::clipboardChanged() void KHexEdit::clipboardChanged()
{ {
// don't listen to selection changes // don't listen to selection changes
disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 );
selectAll( false ); selectAll( false );
} }
@ -1671,14 +1671,14 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e )
// was end of selection operation? // was end of selection operation?
else if( BufferRanges->hasSelection() ) else if( BufferRanges->hasSelection() )
{ {
if( TQApplication::tqclipboard()->supportsSelection() ) if( TQApplication::clipboard()->supportsSelection() )
{ {
ClipboardMode = TQClipboard::Selection; ClipboardMode = TQClipboard::Selection;
disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0); disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
copy(); copy();
connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
ClipboardMode = TQClipboard::Clipboard; ClipboardMode = TQClipboard::Clipboard;
} }
} }
@ -2005,14 +2005,14 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
{ {
selectAll(); selectAll();
// if the clipboard support selections, put the newly selected text into the clipboard // if the clipboard support selections, put the newly selected text into the clipboard
if( TQApplication::tqclipboard()->supportsSelection() ) if( TQApplication::clipboard()->supportsSelection() )
{ {
ClipboardMode = TQClipboard::Selection; ClipboardMode = TQClipboard::Selection;
disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0); disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
copy(); copy();
connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
ClipboardMode = TQClipboard::Clipboard; ClipboardMode = TQClipboard::Clipboard;
} }
} }

4
khexedit/lib/khexedit.h
Unescape View File

@ -425,7 +425,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
protected: protected:
/** recalcs all dependant values with the actual NoOfBytesPerLine */ /** recalcs all dependant values with the actual NoOfBytesPerLine */
void adjustToLayoutNoOfBytesPerLine(); void adjustToLayoutNoOfBytesPerLine();
/** recalcs a tqlayout due to the resize style that fits into the view size /** recalcs a layout due to the resize style that fits into the view size
* and updates the dependant values * and updates the dependant values
*/ */
void adjustLayoutToSize(); void adjustLayoutToSize();
@ -452,7 +452,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
/** Buffer with the data */ /** Buffer with the data */
KDataBuffer *DataBuffer; KDataBuffer *DataBuffer;
/** holds the logical tqlayout */ /** holds the logical layout */
KBufferLayout *BufferLayout; KBufferLayout *BufferLayout;
/** */ /** */
KBufferCursor *BufferCursor; KBufferCursor *BufferCursor;

2
khexedit/lib/koffsetcolumn.h
Unescape View File

@ -81,7 +81,7 @@ class KOffsetColumn : public KColumn
/** */ /** */
KPixelY DigitBaseLine; KPixelY DigitBaseLine;
protected: // general tqlayout protected: // general layout
KOffsetFormat::KFormat Format; KOffsetFormat::KFormat Format;
int CodingWidth; int CodingWidth;

48
khexedit/optiondialog.cc
Unescape View File

@ -260,7 +260,7 @@ void COptionDialog::setupCursorPage( void )
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page ); TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page );
group->tqlayout()->setMargin( spacingHint() ); group->layout()->setMargin( spacingHint() );
topLayout->addWidget( group ); topLayout->addWidget( group );
text = i18n("Do not b&link"); text = i18n("Do not b&link");
@ -282,7 +282,7 @@ void COptionDialog::setupCursorPage( void )
TQT_SLOT( slotChanged())); TQT_SLOT( slotChanged()));
group = new TQVButtonGroup( i18n("Shape"), page ); group = new TQVButtonGroup( i18n("Shape"), page );
group->tqlayout()->setMargin( spacingHint() ); group->layout()->setMargin( spacingHint() );
topLayout->addWidget( group ); topLayout->addWidget( group );
text = i18n("Always &use block (rectangular) cursor"); text = i18n("Always &use block (rectangular) cursor");
@ -298,7 +298,7 @@ void COptionDialog::setupCursorPage( void )
text = i18n("Cursor Behavior When Editor Loses Focus"); text = i18n("Cursor Behavior When Editor Loses Focus");
group = new TQVButtonGroup( text, page ); group = new TQVButtonGroup( text, page );
group->tqlayout()->setMargin( spacingHint() ); group->layout()->setMargin( spacingHint() );
topLayout->addWidget( group ); topLayout->addWidget( group );
text = i18n("&Stop blinking (if blinking is enabled)"); text = i18n("&Stop blinking (if blinking is enabled)");
@ -548,7 +548,7 @@ void COptionDialog::setupMiscPage( void )
this, TQT_SLOT( slotChanged())); this, TQT_SLOT( slotChanged()));
TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page ); TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page );
group->tqlayout()->setMargin( spacingHint() ); group->layout()->setMargin( spacingHint() );
topLayout->addWidget( group ); topLayout->addWidget( group );
text = i18n("Make sound on data &input (eg. typing) failure"); text = i18n("Make sound on data &input (eg. typing) failure");
mMisc.inputCheck = new TQCheckBox( text, group ); mMisc.inputCheck = new TQCheckBox( text, group );
@ -560,7 +560,7 @@ void COptionDialog::setupMiscPage( void )
this, TQT_SLOT( slotChanged())); this, TQT_SLOT( slotChanged()));
group = new TQVButtonGroup( i18n("Bookmark Visibility"), page ); group = new TQVButtonGroup( i18n("Bookmark Visibility"), page );
group->tqlayout()->setMargin( spacingHint() ); group->layout()->setMargin( spacingHint() );
topLayout->addWidget( group ); topLayout->addWidget( group );
text = i18n("Use visible bookmarks in the offset column"); text = i18n("Use visible bookmarks in the offset column");
mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); mMisc.bookmarkColumnCheck = new TQCheckBox( text, group );
@ -696,9 +696,9 @@ void COptionDialog::slotDefault( void )
{ {
case page_layout: case page_layout:
{ {
SDisplayLayout tqlayout; SDisplayLayout layout;
SDisplayLine line; SDisplayLine line;
setLayout( tqlayout, line ); setLayout( layout, line );
} }
break; break;
@ -758,7 +758,7 @@ void COptionDialog::slotApply( void )
mDisplayState.line.setColumnSize(index, mLayout.columnSizeSpin->value()); mDisplayState.line.setColumnSize(index, mLayout.columnSizeSpin->value());
emit lineSizeChoice( mDisplayState.line ); emit lineSizeChoice( mDisplayState.line );
SDisplayLayout &l = mDisplayState.tqlayout; SDisplayLayout &l = mDisplayState.layout;
l.lockLine = mLayout.lockLineCheck->isChecked(); l.lockLine = mLayout.lockLineCheck->isChecked();
l.lockColumn = mLayout.lockColumnCheck->isChecked(); l.lockColumn = mLayout.lockColumnCheck->isChecked();
l.leftSeparatorWidth = mLayout.leftSepWidthSpin->value(); l.leftSeparatorWidth = mLayout.leftSepWidthSpin->value();
@ -789,7 +789,7 @@ void COptionDialog::slotApply( void )
l.horzGridWidth = l.vertGridWidth = 1; l.horzGridWidth = l.vertGridWidth = 1;
} }
emit layoutChoice( mDisplayState.tqlayout ); emit layoutChoice( mDisplayState.layout );
} }
break; break;
@ -883,23 +883,23 @@ void COptionDialog::slotApply( void )
configChanged = false; configChanged = false;
} }
void COptionDialog::setLayout( SDisplayLayout &tqlayout, SDisplayLine &line ) void COptionDialog::setLayout( SDisplayLayout &layout, SDisplayLine &line )
{ {
mDisplayState.line = line; mDisplayState.line = line;
mDisplayState.tqlayout = tqlayout; mDisplayState.layout = layout;
slotModeSelectorChanged( mLayout.formatCombo->currentItem() ); slotModeSelectorChanged( mLayout.formatCombo->currentItem() );
mLayout.lockLineCheck->setChecked( tqlayout.lockLine ); mLayout.lockLineCheck->setChecked( layout.lockLine );
mLayout.lockColumnCheck->setChecked( tqlayout.lockColumn ); mLayout.lockColumnCheck->setChecked( layout.lockColumn );
mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth ); mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth );
mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth ); mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth );
mLayout.separatorSpin->setValue( tqlayout.separatorMarginWidth ); mLayout.separatorSpin->setValue( layout.separatorMarginWidth );
mLayout.edgeSpin->setValue( tqlayout.edgeMarginWidth ); mLayout.edgeSpin->setValue( layout.edgeMarginWidth );
mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth ); mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth );
mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth ); mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth );
mLayout.columnCheck->setChecked( tqlayout.columnCharSpace ); mLayout.columnCheck->setChecked( layout.columnCharSpace );
slotColumnSepCheck( tqlayout.columnCharSpace ); slotColumnSepCheck( layout.columnCharSpace );
mLayout.columnSepSpin->setValue( tqlayout.columnSpacing ); mLayout.columnSepSpin->setValue( layout.columnSpacing );
if( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 ) if( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 )
{ {
@ -911,7 +911,7 @@ void COptionDialog::setLayout( SDisplayLayout &tqlayout, SDisplayLine &line )
} }
else else
{ {
mLayout.gridCombo->setCurrentItem( tqlayout.vertGridWidth != 0 ? 1 : 2 ); mLayout.gridCombo->setCurrentItem( layout.vertGridWidth != 0 ? 1 : 2 );
} }
} }
@ -1021,7 +1021,7 @@ void COptionDialog::setFile( SDisplayMisc &misc )
void COptionDialog::setState( SDisplayState &state ) void COptionDialog::setState( SDisplayState &state )
{ {
setLayout( state.tqlayout, state.line ); setLayout( state.layout, state.line );
setCursor( state.cursor ); setCursor( state.cursor );
setColor( state.color ); setColor( state.color );
setFont( state.font ); setFont( state.font );

4
khexedit/optiondialog.h
Unescape View File

@ -110,7 +110,7 @@ class COptionDialog : public KDialogBase
COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false );
~COptionDialog( void ); ~COptionDialog( void );
void setLayout( SDisplayLayout &tqlayout, SDisplayLine &line ); void setLayout( SDisplayLayout &layout, SDisplayLine &line );
void setCursor( SDisplayCursor &cursor ); void setCursor( SDisplayCursor &cursor );
void setColor( SDisplayColor &color ); void setColor( SDisplayColor &color );
void setFont( SDisplayFont &font ); void setFont( SDisplayFont &font );
@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase
signals: signals:
void lineSizeChoice( const SDisplayLine &lineSize ); void lineSizeChoice( const SDisplayLine &lineSize );
void layoutChoice( const SDisplayLayout &tqlayout ); void layoutChoice( const SDisplayLayout &layout );
void cursorChoice( const SDisplayCursor &cursor ); void cursorChoice( const SDisplayCursor &cursor );
void colorChoice( const SDisplayColor &color ); void colorChoice( const SDisplayColor &color );
void fontChoice( const SDisplayFont &font ); void fontChoice( const SDisplayFont &font );

2
khexedit/parts/kbytesedit/kbyteseditwidget.h
Unescape View File

@ -94,7 +94,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
virtual void setCursorPosition( int Index ); virtual void setCursorPosition( int Index );
// virtual bool tabChangesFocus() const; // virtual bool tabChangesFocus() const;
public: // tqlayout interface ?? public: // layout interface ??
/** sets the resizestyle for the value column. Default is KHE::FullSizeUsage */ /** sets the resizestyle for the value column. Default is KHE::FullSizeUsage */
virtual void setResizeStyle( KResizeStyle Style ); virtual void setResizeStyle( KResizeStyle Style );
/** sets the number of bytes per line, switching the resize style to KHE::NoResize */ /** sets the number of bytes per line, switching the resize style to KHE::NoResize */

2
khexedit/searchbar.cc
Unescape View File

@ -85,7 +85,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) );
// //
// Make tqlayout // Make layout
// //
TQHBoxLayout *hlay = new TQHBoxLayout( this, 4, 6 ); TQHBoxLayout *hlay = new TQHBoxLayout( this, 4, 6 );
hlay->addWidget( mTypeCombo ); hlay->addWidget( mTypeCombo );

10
khexedit/statusbarprogress.cc
Unescape View File

@ -69,8 +69,8 @@ void CStatusBarProgress::initialize( void )
mBarColor = tqpalette().active().highlight(); mBarColor = tqpalette().active().highlight();
mBarTextColor = tqpalette().active().highlightedText(); mBarTextColor = tqpalette().active().highlightedText();
mTextColor = tqpalette().active().text(); mTextColor = palette().active().text();
setBackgroundColor( tqpalette().active().background() ); setBackgroundColor( palette().active().background() );
TQFont font( KGlobalSettings::generalFont() ); TQFont font( KGlobalSettings::generalFont() );
font.setBold( true ); font.setBold( true );
@ -229,7 +229,7 @@ void CStatusBarProgress::styleChange( GUIStyle )
void CStatusBarProgress::adjustStyle( void ) void CStatusBarProgress::adjustStyle( void )
{ {
switch( tqstyle().SH_GUIStyle) switch( style().SH_GUIStyle)
{ {
case WindowsStyle: case WindowsStyle:
setFrameStyle( TQFrame::NoFrame ); setFrameStyle( TQFrame::NoFrame );
@ -248,8 +248,8 @@ void CStatusBarProgress::paletteChange( const TQPalette & )
{ {
mBarColor = tqpalette().active().highlight(); mBarColor = tqpalette().active().highlight();
mBarTextColor = tqpalette().active().highlightedText(); mBarTextColor = tqpalette().active().highlightedText();
mTextColor = tqpalette().active().text(); mTextColor = palette().active().text();
setBackgroundColor( tqpalette().active().background() ); setBackgroundColor( palette().active().background() );
} }
void CStatusBarProgress::drawText( TQPainter *p ) void CStatusBarProgress::drawText( TQPainter *p )

38
khexedit/toplevel.cc
Unescape View File

@ -755,11 +755,11 @@ void KHexEdit::cursorChanged( SCursorState &state )
} }
else else
{ {
SDisplayLayout &tqlayout = editor()->tqlayout(); SDisplayLayout &layout = editor()->layout();
if( tqlayout.offsetMode == SDisplayLayout::hexadecimal ) if( layout.offsetMode == SDisplayLayout::hexadecimal )
{ {
if( tqlayout.offsetUpperCase == false ) if( layout.offsetUpperCase == false )
{ {
offset += TQString().sprintf( " %04x:%04x-%u", state.offset>>16, offset += TQString().sprintf( " %04x:%04x-%u", state.offset>>16,
state.offset&0x0000FFFF, state.cell ); state.offset&0x0000FFFF, state.cell );
@ -807,23 +807,23 @@ void KHexEdit::fileState( SFileState &state )
void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout ) void KHexEdit::layoutChanged( const SDisplayLayout &layout )
{ {
KRadioAction *radioAction; KRadioAction *radioAction;
if( tqlayout.primaryMode == SDisplayLayout::hexadecimal ) if( layout.primaryMode == SDisplayLayout::hexadecimal )
{ {
radioAction = mAction.hexadecimal; radioAction = mAction.hexadecimal;
} }
else if( tqlayout.primaryMode == SDisplayLayout::decimal ) else if( layout.primaryMode == SDisplayLayout::decimal )
{ {
radioAction = mAction.decimal; radioAction = mAction.decimal;
} }
else if( tqlayout.primaryMode == SDisplayLayout::octal ) else if( layout.primaryMode == SDisplayLayout::octal )
{ {
radioAction = mAction.octal; radioAction = mAction.octal;
} }
else if( tqlayout.primaryMode == SDisplayLayout::binary ) else if( layout.primaryMode == SDisplayLayout::binary )
{ {
radioAction = mAction.binary; radioAction = mAction.binary;
} }
@ -841,15 +841,15 @@ void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
mAction.dataUppercase->blockSignals(true); mAction.dataUppercase->blockSignals(true);
mAction.offsetUppercase->blockSignals(true); mAction.offsetUppercase->blockSignals(true);
mAction.showOffsetColumn->setChecked( tqlayout.offsetVisible ); mAction.showOffsetColumn->setChecked( layout.offsetVisible );
mAction.showTextColumn->setEnabled( mAction.showTextColumn->setEnabled(
tqlayout.primaryMode != SDisplayLayout::textOnly ); layout.primaryMode != SDisplayLayout::textOnly );
mAction.showTextColumn->setChecked( mAction.showTextColumn->setChecked(
tqlayout.secondaryMode != SDisplayLayout::hide ); layout.secondaryMode != SDisplayLayout::hide );
mAction.offsetAsDecimal->setChecked( mAction.offsetAsDecimal->setChecked(
tqlayout.offsetMode != SDisplayLayout::hexadecimal); layout.offsetMode != SDisplayLayout::hexadecimal);
mAction.dataUppercase->setChecked( tqlayout.primaryUpperCase ); mAction.dataUppercase->setChecked( layout.primaryUpperCase );
mAction.offsetUppercase->setChecked( tqlayout.offsetUpperCase ); mAction.offsetUppercase->setChecked( layout.offsetUpperCase );
mAction.showOffsetColumn->blockSignals(false); mAction.showOffsetColumn->blockSignals(false);
mAction.showTextColumn->blockSignals(false); mAction.showTextColumn->blockSignals(false);
@ -857,23 +857,23 @@ void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
mAction.dataUppercase->blockSignals(false); mAction.dataUppercase->blockSignals(false);
mAction.offsetUppercase->blockSignals(false); mAction.offsetUppercase->blockSignals(false);
if( tqlayout.primaryMode == SDisplayLayout::hexadecimal ) if( layout.primaryMode == SDisplayLayout::hexadecimal )
{ {
statusBar()->changeItem( i18n("Hex"), status_Layout ); statusBar()->changeItem( i18n("Hex"), status_Layout );
} }
else if( tqlayout.primaryMode == SDisplayLayout::decimal ) else if( layout.primaryMode == SDisplayLayout::decimal )
{ {
statusBar()->changeItem( i18n("Dec"), status_Layout ); statusBar()->changeItem( i18n("Dec"), status_Layout );
} }
else if( tqlayout.primaryMode == SDisplayLayout::octal ) else if( layout.primaryMode == SDisplayLayout::octal )
{ {
statusBar()->changeItem( i18n("Oct"), status_Layout ); statusBar()->changeItem( i18n("Oct"), status_Layout );
} }
else if( tqlayout.primaryMode == SDisplayLayout::binary ) else if( layout.primaryMode == SDisplayLayout::binary )
{ {
statusBar()->changeItem( i18n("Bin"), status_Layout ); statusBar()->changeItem( i18n("Bin"), status_Layout );
} }
else if( tqlayout.primaryMode == SDisplayLayout::textOnly ) else if( layout.primaryMode == SDisplayLayout::textOnly )
{ {
statusBar()->changeItem( i18n("Txt"), status_Layout ); statusBar()->changeItem( i18n("Txt"), status_Layout );
} }

2
khexedit/toplevel.h
Unescape View File

@ -157,7 +157,7 @@ class KHexEdit : public KMainWindow
void operationChanged( bool state ); void operationChanged( bool state );
void cursorChanged( SCursorState &state ); void cursorChanged( SCursorState &state );
void fileState( SFileState &state ); void fileState( SFileState &state );
void layoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &layout );
void inputModeChanged( const SDisplayInputMode &mode ); void inputModeChanged( const SDisplayInputMode &mode );
void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void bookmarkChanged( TQPtrList<SCursorOffset> &list );
void removeRecentFile( const TQString &fileName ); void removeRecentFile( const TQString &fileName );

10
kjots/CHANGES
Unescape View File

@ -15,12 +15,12 @@ new in version 0.5 (Aaron J. Seigo)
new in version 0.4 (Mario Weilguni <mweilguni@kde.org>) new in version 0.4 (Mario Weilguni <mweilguni@kde.org>)
- works now with Qt 2.0 - works now with Qt 2.0
- fixed broken tqlayout of main window - fixed broken layout of main window
- tqlayout improvements in AskFileName() - layout improvements in AskFileName()
- tqlayout improvements in SubjList() - layout improvements in SubjList()
- compiles without warnings - compiles without warnings
- "Apply" button is only activated when changes were made - "Apply" button is only activated when changes were made
- improved tqlayout of configuration dialog - improved layout of configuration dialog
- fixed a bug in the font selection - fixed a bug in the font selection
- now compiles with EGCS ( Robert Williams ) - now compiles with EGCS ( Robert Williams )
@ -59,7 +59,7 @@ new in version 0.2.1
new in version 0.2.0 new in version 0.2.0
- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...) - changed the layout to be more KDE conforming (toolbar, statusbar,...)
- folders are now called books and entries are pages - folders are now called books and entries are pages
- added subject to each page - added subject to each page
- you may popup a window with a list of all subjects and use it to find - you may popup a window with a list of all subjects and use it to find

4
klaptopdaemon/battery.cpp
Unescape View File

@ -112,10 +112,10 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
// group box to hold the icons together // group box to hold the icons together
TQVGroupBox* icons_groupbox = new TQVGroupBox( i18n("Select Battery Icons"), this ); TQVGroupBox* icons_groupbox = new TQVGroupBox( i18n("Select Battery Icons"), this );
icons_groupbox->tqlayout()->setSpacing( KDialog::spacingHint() ); icons_groupbox->layout()->setSpacing( KDialog::spacingHint() );
top_layout->addWidget( icons_groupbox, 0, TQt::AlignLeft ); top_layout->addWidget( icons_groupbox, 0, TQt::AlignLeft );
// tqlayout to hold the icons inside the groupbox // layout to hold the icons inside the groupbox
TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox ); TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox );
icon_grid->setSpacing( KDialog::spacingHint() ); icon_grid->setSpacing( KDialog::spacingHint() );

4
klaptopdaemon/buttons.cpp
Unescape View File

@ -120,7 +120,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
if (laptop_portable::has_button(laptop_portable::LidButton)) { if (laptop_portable::has_button(laptop_portable::LidButton)) {
lidBox = new TQVButtonGroup(i18n("Lid Switch Closed"), this); lidBox = new TQVButtonGroup(i18n("Lid Switch Closed"), this);
lidBox->tqlayout()->setSpacing( KDialog::spacingHint() ); lidBox->layout()->setSpacing( KDialog::spacingHint() );
TQToolTip::add( lidBox, i18n( "Select which actions will occur when the laptop's lid is closed" ) ); TQToolTip::add( lidBox, i18n( "Select which actions will occur when the laptop's lid is closed" ) );
hlay->addWidget( lidBox ); hlay->addWidget( lidBox );
@ -196,7 +196,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
if (laptop_portable::has_button(laptop_portable::PowerButton)) { if (laptop_portable::has_button(laptop_portable::PowerButton)) {
powerBox = new TQVButtonGroup(i18n("Power Switch Pressed"), this); powerBox = new TQVButtonGroup(i18n("Power Switch Pressed"), this);
powerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); powerBox->layout()->setSpacing( KDialog::spacingHint() );
TQToolTip::add( powerBox, i18n( "Select which actions will occur when the laptop's power button is pressed" ) ); TQToolTip::add( powerBox, i18n( "Select which actions will occur when the laptop's power button is pressed" ) );
hlay->addWidget( powerBox ); hlay->addWidget( powerBox );

2
klaptopdaemon/krichtextlabel.h
Unescape View File

@ -24,7 +24,7 @@
#include <kdelibs_export.h> #include <kdelibs_export.h>
/** /**
* @short A replacement for TQLabel that supports richtext and proper tqlayout management * @short A replacement for TQLabel that supports richtext and proper layout management
* *
* @author Waldo Bastian <bastian@kde.org> * @author Waldo Bastian <bastian@kde.org>
*/ */

4
klaptopdaemon/main.cpp
Unescape View File

@ -147,9 +147,9 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
enablehibernate = config.readBoolEntry("EnableHibernate", false); enablehibernate = config.readBoolEntry("EnableHibernate", false);
laptop_portable::software_suspend_set_mask(enablehibernate); laptop_portable::software_suspend_set_mask(enablehibernate);
} }
TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this); tab = new TQTabWidget(this);
tqlayout->addWidget(tab); layout->addWidget(tab);
battery = new BatteryConfig(parent, "kcmlaptop"); battery = new BatteryConfig(parent, "kcmlaptop");
tab->addTab(battery, i18n("&Battery")); tab->addTab(battery, i18n("&Battery"));

4
klaptopdaemon/portable.cpp
Unescape View File

@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool )
// adds extra widgets to the battery panel // adds extra widgets to the battery panel
// //
void void
laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/) laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/)
{ {
// INSERT HERE // INSERT HERE
} }
@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int)
// adds extra widgets to the battery panel // adds extra widgets to the battery panel
// //
void void
laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout) laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout)
{ {
// INSERT HERE // INSERT HERE
} }

2
klaptopdaemon/portable.h
Unescape View File

@ -98,7 +98,7 @@ public:
static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status
static bool has_lav(); // true if the following returns a valid value static bool has_lav(); // true if the following returns a valid value
static float get_load_average(); // current short term load average static float get_load_average(); // current short term load average
static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout); static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout);
static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle); static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle);
static void apm_set_mask(bool standby, bool suspend); static void apm_set_mask(bool standby, bool suspend);
static void software_suspend_set_mask(bool hibernate); static void software_suspend_set_mask(bool hibernate);

4
klaptopdaemon/power.cpp
Unescape View File

@ -122,7 +122,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
nopowerBox = new TQVButtonGroup(i18n("Not Powered"), this); nopowerBox = new TQVButtonGroup(i18n("Not Powered"), this);
TQToolTip::add( nopowerBox, i18n( "Options in this box apply when the laptop is unplugged from the wall and has been idle for a while" ) ); TQToolTip::add( nopowerBox, i18n( "Options in this box apply when the laptop is unplugged from the wall and has been idle for a while" ) );
nopowerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); nopowerBox->layout()->setSpacing( KDialog::spacingHint() );
hlay->addWidget( nopowerBox ); hlay->addWidget( nopowerBox );
if (can_standby) { if (can_standby) {
@ -214,7 +214,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
powerBox = new TQVButtonGroup(i18n("Powered"), this); powerBox = new TQVButtonGroup(i18n("Powered"), this);
powerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); powerBox->layout()->setSpacing( KDialog::spacingHint() );
TQToolTip::add( powerBox, i18n( "Options in this box apply when the laptop is plugged into the wall and has been idle for a while" ) ); TQToolTip::add( powerBox, i18n( "Options in this box apply when the laptop is plugged into the wall and has been idle for a while" ) );
hlay->addWidget( powerBox ); hlay->addWidget( powerBox );

2
klaptopdaemon/warning.cpp
Unescape View File

@ -236,7 +236,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
TQVButtonGroup *b = new TQVButtonGroup(i18n("System State Change"), this); TQVButtonGroup *b = new TQVButtonGroup(i18n("System State Change"), this);
TQToolTip::add( b, i18n( "You may choose one of the following to occur when the battery gets low" ) ); TQToolTip::add( b, i18n( "You may choose one of the following to occur when the battery gets low" ) );
b->tqlayout()->setSpacing( KDialog::spacingHint() ); b->layout()->setSpacing( KDialog::spacingHint() );
if (can_standby) { if (can_standby) {
checkStandby = new TQRadioButton(i18n("Standb&y"), b); checkStandby = new TQRadioButton(i18n("Standb&y"), b);
TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) ); TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );

6
kmilo/kmilo_kvaio/kcmkvaio/main.cpp
Unescape View File

@ -61,10 +61,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
"mirko@kde.org"); "mirko@kde.org");
setAboutData( about ); setAboutData( about );
TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
mKVaioGeneral = new KCMKVaioGeneral(this); mKVaioGeneral = new KCMKVaioGeneral(this);
tqlayout->addWidget( mKVaioGeneral ); layout->addWidget( mKVaioGeneral );
tqlayout->addStretch(); layout->addStretch();
mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this)); mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this));
mDriverAvailable = mDriver->connectToDriver(false); mDriverAvailable = mDriver->connectToDriver(false);

2
kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
Unescape View File

@ -62,7 +62,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout27</cstring> <cstring>layout27</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

6
kmilo/thinkpad/kcmthinkpad/main.cpp
Unescape View File

@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
"jr@jriddell.org"); "jr@jriddell.org");
setAboutData( about ); setAboutData( about );
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* layout = new TQVBoxLayout(this);
m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this); m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this);
tqlayout->addWidget( m_KCMThinkpadGeneral ); layout->addWidget( m_KCMThinkpadGeneral );
tqlayout->addStretch(); layout->addStretch();
load(); load();

4
kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
Unescape View File

@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF
TQWidget *widget = theWidget->qWidget(); TQWidget *widget = theWidget->qWidget();
TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); TQHBoxLayout *layout = new TQHBoxLayout( this );
_factory = factory; _factory = factory;
tqlayout->addWidget( widget ); layout->addWidget( widget );
} }
void KMultiFormListBox::append( KMultiFormListBoxEntry *element ) void KMultiFormListBox::append( KMultiFormListBoxEntry *element )

16
kregexpeditor/auxbuttons.cpp
Unescape View File

@ -35,48 +35,48 @@
AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0)
:TQDockWindow( TQDockWindow::InDock, parent, name) :TQDockWindow( TQDockWindow::InDock, parent, name)
{ {
TQBoxLayout* tqlayout = boxLayout(); TQBoxLayout* layout = boxLayout();
_undo = new TQToolButton( this ); _undo = new TQToolButton( this );
_undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) ); _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) );
tqlayout->addWidget( _undo ); layout->addWidget( _undo );
connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) ); connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) );
TQToolTip::add( _undo, i18n( "Undo" ) ); TQToolTip::add( _undo, i18n( "Undo" ) );
_redo = new TQToolButton( this ); _redo = new TQToolButton( this );
_redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("redo") ) ); _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("redo") ) );
tqlayout->addWidget( _redo ); layout->addWidget( _redo );
connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) ); connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) );
TQToolTip::add( _redo, i18n( "Redo" ) ); TQToolTip::add( _redo, i18n( "Redo" ) );
_cut = new TQToolButton( this ); _cut = new TQToolButton( this );
_cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) ); _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) );
tqlayout->addWidget( _cut ); layout->addWidget( _cut );
connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) ); connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) );
TQToolTip::add( _cut, i18n( "Cut" ) ); TQToolTip::add( _cut, i18n( "Cut" ) );
_copy = new TQToolButton( this ); _copy = new TQToolButton( this );
_copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) ); _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) );
tqlayout->addWidget( _copy ); layout->addWidget( _copy );
connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) ); connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) );
TQToolTip::add( _copy, i18n( "Copy" ) ); TQToolTip::add( _copy, i18n( "Copy" ) );
_paste = new TQToolButton( this ); _paste = new TQToolButton( this );
_paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) ); _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) );
tqlayout->addWidget( _paste ); layout->addWidget( _paste );
connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) ); connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) );
TQToolTip::add( _paste, i18n( "Paste" ) ); TQToolTip::add( _paste, i18n( "Paste" ) );
_save = new TQToolButton( this ); _save = new TQToolButton( this );
_save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) ); _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) );
tqlayout->addWidget( _save ); layout->addWidget( _save );
connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) ); connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) );
TQToolTip::add( _save, i18n( "Save" ) ); TQToolTip::add( _save, i18n( "Save" ) );
TQToolButton* button = new TQToolButton(this); TQToolButton* button = new TQToolButton(this);
button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) ); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) );
tqlayout->addWidget( button ); layout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis()));
_undo->setEnabled( false ); _undo->setEnabled( false );

18
kregexpeditor/characterswidget.cpp
Unescape View File

@ -380,10 +380,10 @@ void CharacterEdits::slotOK()
SingleEntry::SingleEntry(TQWidget* parent, const char* name ) SingleEntry::SingleEntry(TQWidget* parent, const char* name )
:KMultiFormListBoxEntry( parent, name ) :KMultiFormListBoxEntry( parent, name )
{ {
TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 );
_selector = new CharSelector( this ); _selector = new CharSelector( this );
tqlayout->addWidget( _selector ); layout->addWidget( _selector );
tqlayout->addStretch(1); layout->addStretch(1);
} }
TQString SingleEntry::text() const TQString SingleEntry::text() const
@ -405,19 +405,19 @@ bool SingleEntry::isEmpty() const
RangeEntry::RangeEntry(TQWidget* parent, const char* name ) RangeEntry::RangeEntry(TQWidget* parent, const char* name )
:KMultiFormListBoxEntry( parent, name ) :KMultiFormListBoxEntry( parent, name )
{ {
TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 );
TQLabel* label = new TQLabel(i18n("From:"), this ); TQLabel* label = new TQLabel(i18n("From:"), this );
_from = new CharSelector( this ); _from = new CharSelector( this );
tqlayout->addWidget( label ); layout->addWidget( label );
tqlayout->addWidget( _from ); layout->addWidget( _from );
tqlayout->addStretch(1); layout->addStretch(1);
label = new TQLabel(i18n("end of range","To:"), this ); label = new TQLabel(i18n("end of range","To:"), this );
_to = new CharSelector( this ); _to = new CharSelector( this );
tqlayout->addWidget( label ); layout->addWidget( label );
tqlayout->addWidget( _to ); layout->addWidget( _to );
} }
TQString RangeEntry::fromText() const TQString RangeEntry::fromText() const

12
kregexpeditor/charselector.cpp
Unescape View File

@ -43,10 +43,10 @@ class StackContainer :public TQWidget
public: public:
StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent ) StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent )
{ {
TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); TQHBoxLayout* layout = new TQHBoxLayout( this );
child->reparent( this, TQPoint(0,0), false ); child->reparent( this, TQPoint(0,0), false );
tqlayout->addWidget( child ); layout->addWidget( child );
tqlayout->addStretch( 1 ); layout->addStretch( 1 );
} }
}; };
@ -54,7 +54,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name )
:TQWidget( parent, name ), _oldIndex(0) :TQWidget( parent, name ), _oldIndex(0)
{ {
TQStringList items; TQStringList items;
TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 ); TQHBoxLayout* layout = new TQHBoxLayout( this, 0, 6 );
_type = new TQComboBox( this, "_type" ); _type = new TQComboBox( this, "_type" );
items << i18n("Normal Character") items << i18n("Normal Character")
@ -68,10 +68,10 @@ CharSelector::CharSelector( TQWidget* parent, const char* name )
<< i18n("TheQt::Horizontal Tab Character (\\t)") << i18n("TheQt::Horizontal Tab Character (\\t)")
<< i18n("TheQt::Vertical Tab Character (\\v)"); << i18n("TheQt::Vertical Tab Character (\\v)");
_type->insertStringList( items ); _type->insertStringList( items );
tqlayout->addWidget( _type ); layout->addWidget( _type );
_stack = new TQWidgetStack( this, "_stack" ); _stack = new TQWidgetStack( this, "_stack" );
tqlayout->addWidget( _stack ); layout->addWidget( _stack );
_normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" ); _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" );
_stack->addWidget( new StackContainer( _normal, _stack ), 0 ); _stack->addWidget( new StackContainer( _normal, _stack ), 0 );

4
kregexpeditor/compoundwidget.cpp
Unescape View File

@ -40,8 +40,8 @@
CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name ) CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name )
:TQWidget( parent, name ) :TQWidget( parent, name )
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); TQVBoxLayout* layout = new TQVBoxLayout( this );
tqlayout->setAutoAdd( true ); layout->setAutoAdd( true );
TQLabel* label = new TQLabel( i18n("&Title:"), this); TQLabel* label = new TQLabel( i18n("&Title:"), this);
_title = new TQLineEdit( this ); _title = new TQLineEdit( this );

6
kregexpeditor/editorwindow.cpp
Unescape View File

@ -289,7 +289,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos )
RegExpWidgetDrag *clipboardData = new RegExpWidgetDrag( regexp, this ); RegExpWidgetDrag *clipboardData = new RegExpWidgetDrag( regexp, this );
delete regexp; delete regexp;
TQClipboard* clipboard = tqApp->tqclipboard(); TQClipboard* clipboard = tqApp->clipboard();
clipboard->setData( clipboardData ); clipboard->setData( clipboardData );
emit anythingOnClipboard( true ); emit anythingOnClipboard( true );
emit canSave( _top->hasAnyChildren() ); emit canSave( _top->hasAnyChildren() );
@ -298,7 +298,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos )
void RegExpEditorWindow::slotStartPasteAction() void RegExpEditorWindow::slotStartPasteAction()
{ {
TQByteArray data = tqApp->tqclipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" ); TQByteArray data = tqApp->clipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" );
TQTextStream stream( data, IO_ReadOnly ); TQTextStream stream( data, IO_ReadOnly );
TQString str = stream.read(); TQString str = stream.read();
@ -335,7 +335,7 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy )
_menu->setItemEnabled( CUT, enableCutCopy ); _menu->setItemEnabled( CUT, enableCutCopy );
_menu->setItemEnabled( COPY, enableCutCopy ); _menu->setItemEnabled( COPY, enableCutCopy );
if ( ! tqApp->tqclipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) ) if ( ! tqApp->clipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) )
_menu->setItemEnabled( PASTE, false ); _menu->setItemEnabled( PASTE, false );
else else
_menu->setItemEnabled( PASTE, true ); _menu->setItemEnabled( PASTE, true );

2
kregexpeditor/editorwindow.h
Unescape View File

@ -232,7 +232,7 @@ private:
/** This points to the top @ref RegExpWidget in the editor window. */ /** This points to the top @ref RegExpWidget in the editor window. */
ConcWidget *_top; ConcWidget *_top;
/** This points to the tqlayout manager for the editor window */ /** This points to the layout manager for the editor window */
TQHBoxLayout* _layout; TQHBoxLayout* _layout;
/** Start point and last point draw. Used when doing rubber band selection */ /** Start point and last point draw. Used when doing rubber band selection */

8
kregexpeditor/kregexpeditorgui.cpp
Unescape View File

@ -38,9 +38,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name,
const TQStringList & ) const TQStringList & )
: TQWidget( parent, name) : TQWidget( parent, name)
{ {
TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6 ); TQHBoxLayout* layout = new TQHBoxLayout( this, 6 );
_editor = new KRegExpEditorPrivate( this, "_editor" ); _editor = new KRegExpEditorPrivate( this, "_editor" );
tqlayout->addWidget( _editor ); layout->addWidget( _editor );
connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) );
connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) );
connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) );
@ -74,8 +74,8 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent,
parent, name ? name : "KRegExpDialog" ) parent, name ? name : "KRegExpDialog" )
{ {
TQFrame* frame = plainPage(); TQFrame* frame = plainPage();
TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 6 ); TQVBoxLayout* layout = new TQVBoxLayout( frame, 6 );
tqlayout->setAutoAdd( true ); layout->setAutoAdd( true );
_editor = new KRegExpEditorGUI( frame ); _editor = new KRegExpEditorGUI( frame );
connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) );

10
kregexpeditor/kregexpeditorprivate.cpp
Unescape View File

@ -154,17 +154,17 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
// Line Edit // Line Edit
TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout, 6 ); TQHBoxLayout* layout = new TQHBoxLayout( topLayout, 6 );
TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this ); TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this );
tqlayout->addWidget( label ); layout->addWidget( label );
clearButton = new TQToolButton( this ); clearButton = new TQToolButton( this );
const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
TQIconSet clearIcon = SmallIconSet( icon ); TQIconSet clearIcon = SmallIconSet( icon );
clearButton->setIconSet( clearIcon ); clearButton->setIconSet( clearIcon );
tqlayout->addWidget( clearButton ); layout->addWidget( clearButton );
TQToolTip::add( clearButton, i18n("Clear expression") ); TQToolTip::add( clearButton, i18n("Clear expression") );
_regexpEdit = new TQLineEdit( this ); _regexpEdit = new TQLineEdit( this );
tqlayout->addWidget( _regexpEdit ); layout->addWidget( _regexpEdit );
TQWhatsThis::add( _regexpEdit, i18n( "This is the regular expression in ASCII syntax. You are likely only " TQWhatsThis::add( _regexpEdit, i18n( "This is the regular expression in ASCII syntax. You are likely only "
"to be interested in this if you are a programmer, and need to " "to be interested in this if you are a programmer, and need to "
"develop a regular expression using TQRegExp.<p>" "develop a regular expression using TQRegExp.<p>"
@ -178,7 +178,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
#endif #endif
_error = new TQLabel( this ); _error = new TQLabel( this );
_error->setPixmap( pix ); _error->setPixmap( pix );
tqlayout->addWidget( _error ); layout->addWidget( _error );
_error->hide(); _error->hide();
_timer = new TQTimer(this); _timer = new TQTimer(this);

28
kregexpeditor/regexpbuttons.cpp
Unescape View File

@ -37,7 +37,7 @@
RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
: TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false) : TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false)
{ {
TQBoxLayout *tqlayout = boxLayout(); TQBoxLayout *layout = boxLayout();
_grp = new TQButtonGroup(this); _grp = new TQButtonGroup(this);
_grp->hide(); _grp->hide();
@ -57,7 +57,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
#endif #endif
_selectBut->setPixmap( pix ); _selectBut->setPixmap( pix );
tqlayout->addWidget( _selectBut ); layout->addWidget( _selectBut );
_grp->insert(_selectBut); _grp->insert(_selectBut);
_selectBut->setToggleButton( true ); _selectBut->setToggleButton( true );
connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect()));
@ -76,19 +76,19 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
but = insert(TEXT, "text", i18n("Text"), but = insert(TEXT, "text", i18n("Text"),
i18n( "<qt>This will insert a text field, where you may write text. The text you write will " i18n( "<qt>This will insert a text field, where you may write text. The text you write will "
"be matched literally. (i.e. you do not need to escape any characters)</qt>" ) ); "be matched literally. (i.e. you do not need to escape any characters)</qt>" ) );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(CHARSET, "characters", i18n("A single character specified in a range"), but = insert(CHARSET, "characters", i18n("A single character specified in a range"),
i18n("<qt>This will match a single character from a predefined range.<p>" i18n("<qt>This will match a single character from a predefined range.<p>"
"When you insert this widget a dialog box will appear, which lets you specify " "When you insert this widget a dialog box will appear, which lets you specify "
"which characters this <i>regexp item</i> will match.</qt>") ); "which characters this <i>regexp item</i> will match.</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(DOT, "anychar", i18n("Any character"), but = insert(DOT, "anychar", i18n("Any character"),
i18n("<qt>This will match any single character</qt>") ); i18n("<qt>This will match any single character</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(REPEAT, "repeat", i18n("Repeated content"), but = insert(REPEAT, "repeat", i18n("Repeated content"),
@ -102,14 +102,14 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
"is <tt>abc</tt>, then this <i>regexp item</i> will match the empty string, " "is <tt>abc</tt>, then this <i>regexp item</i> will match the empty string, "
"the string <tt>abc</tt>, the string <tt>abcabc</tt>, the string <tt>abcabcabcabc</tt>, " "the string <tt>abc</tt>, the string <tt>abcabc</tt>, the string <tt>abcabcabcabc</tt>, "
"etc.</qt>") ); "etc.</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(ALTN, "altn", i18n("Alternatives"), but = insert(ALTN, "altn", i18n("Alternatives"),
i18n("<qt>This <i>regexp item</i> will match any of its alternatives.</p>" i18n("<qt>This <i>regexp item</i> will match any of its alternatives.</p>"
"You specify alternatives by placing <i>regexp items</i> on top of " "You specify alternatives by placing <i>regexp items</i> on top of "
"each other inside this widget.</qt>") ); "each other inside this widget.</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(COMPOUND, "compound", i18n("Compound regexp"), but = insert(COMPOUND, "compound", i18n("Compound regexp"),
@ -118,38 +118,38 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
"a small box. This makes it easier for you to get an overview of large " "a small box. This makes it easier for you to get an overview of large "
"<i>regexp items</i>. This is especially useful if you load a predefined <i>regexp item</i> " "<i>regexp items</i>. This is especially useful if you load a predefined <i>regexp item</i> "
"you perhaps don't care about the inner workings of.") ); "you perhaps don't care about the inner workings of.") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(BEGLINE, "begline", i18n("Beginning of line"), but = insert(BEGLINE, "begline", i18n("Beginning of line"),
i18n("<qt>This will match the beginning of a line.</qt>") ); i18n("<qt>This will match the beginning of a line.</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
but = insert(ENDLINE, "endline", i18n("End of line"), but = insert(ENDLINE, "endline", i18n("End of line"),
i18n("<qt>This will match the end of a line.</qt>") ); i18n("<qt>This will match the end of a line.</qt>") );
tqlayout->addWidget( but ); layout->addWidget( but );
_wordBoundary = insert(WORDBOUNDARY, "wordboundary", i18n("Word boundary"), _wordBoundary = insert(WORDBOUNDARY, "wordboundary", i18n("Word boundary"),
i18n("<qt>This asserts a word boundary (This part does not actually match any characters)</qt>") ); i18n("<qt>This asserts a word boundary (This part does not actually match any characters)</qt>") );
tqlayout->addWidget( _wordBoundary ); layout->addWidget( _wordBoundary );
_nonWordBoundary = insert(NONWORDBOUNDARY, "nonwordboundary", i18n("Non Word boundary"), _nonWordBoundary = insert(NONWORDBOUNDARY, "nonwordboundary", i18n("Non Word boundary"),
i18n("<qt>This asserts a non-word boundary " i18n("<qt>This asserts a non-word boundary "
"(This part does not actually match any characters)</qt>") ); "(This part does not actually match any characters)</qt>") );
tqlayout->addWidget( _nonWordBoundary ); layout->addWidget( _nonWordBoundary );
_posLookAhead = insert(POSLOOKAHEAD, "poslookahead", i18n("Positive Look Ahead"), _posLookAhead = insert(POSLOOKAHEAD, "poslookahead", i18n("Positive Look Ahead"),
i18n("<qt>This asserts a regular expression (This part does not actually match any characters). " i18n("<qt>This asserts a regular expression (This part does not actually match any characters). "
"You can only use this at the end of a regular expression.</qt>") ); "You can only use this at the end of a regular expression.</qt>") );
tqlayout->addWidget( _posLookAhead ); layout->addWidget( _posLookAhead );
_negLookAhead = insert(NEGLOOKAHEAD, "neglookahead", i18n("Negative Look Ahead"), _negLookAhead = insert(NEGLOOKAHEAD, "neglookahead", i18n("Negative Look Ahead"),
i18n("<qt>This asserts a regular expression that must not match " i18n("<qt>This asserts a regular expression that must not match "
"(This part does not actually match any characters). " "(This part does not actually match any characters). "
"You can only use this at the end of a regular expression.</qt>") ); "You can only use this at the end of a regular expression.</qt>") );
tqlayout->addWidget( _negLookAhead ); layout->addWidget( _negLookAhead );
} }
DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQString tooltip, TQString whatsthis) DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQString tooltip, TQString whatsthis)

2
kregexpeditor/selectablelineedit.cpp
Unescape View File

@ -33,7 +33,7 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, c
void SelectableLineEdit::setSelected( bool selected ) void SelectableLineEdit::setSelected( bool selected )
{ {
if ( selected ) { if ( selected ) {
TQPalette pal = TQPalette(tqpalette()); TQPalette pal = TQPalette(palette());
pal.setBrush( TQColorGroup::Base, gray ); pal.setBrush( TQColorGroup::Base, gray );
setPalette( pal ); setPalette( pal );
} }

20
kregexpeditor/verifybuttons.cpp
Unescape View File

@ -42,7 +42,7 @@
VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
:TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 ) :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 )
{ {
TQBoxLayout* tqlayout = boxLayout(); TQBoxLayout* layout = boxLayout();
_verify = new TQToolButton(this); _verify = new TQToolButton(this);
TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck")); TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck"));
@ -50,48 +50,48 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
TQToolTip::add( _verify, i18n( "Verify regular expression" ) ); TQToolTip::add( _verify, i18n( "Verify regular expression" ) );
TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>." TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>."
"(The window below the graphical editor window).")); "(The window below the graphical editor window)."));
tqlayout->addWidget( _verify ); layout->addWidget( _verify );
connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) ); connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) );
TQToolButton* button = new TQToolButton(this); TQToolButton* button = new TQToolButton(this);
button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) ); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) );
tqlayout->addWidget( button ); layout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText())); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText()));
TQToolTip::add( button, i18n("Load text in the verifier window") ); TQToolTip::add( button, i18n("Load text in the verifier window") );
button = new TQToolButton(this); button = new TQToolButton(this);
button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) ); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) );
tqlayout->addWidget( button ); layout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure())); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()));
TQToolTip::add( button, i18n("Settings") ); TQToolTip::add( button, i18n("Settings") );
// It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match // It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match
// do not work. Enable this when they work. // do not work. Enable this when they work.
// _first = new TQToolButton( TQString::fromLatin1("<<"), this); // _first = new TQToolButton( TQString::fromLatin1("<<"), this);
// tqlayout->addWidget( _first ); // layout->addWidget( _first );
// connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst())); // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst()));
// _first->setFixedWidth( 25 ); // _first->setFixedWidth( 25 );
// //
// _prev = new TQToolButton(TQString::fromLatin1("<"), this); // _prev = new TQToolButton(TQString::fromLatin1("<"), this);
// tqlayout->addWidget( _prev ); // layout->addWidget( _prev );
// connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev())); // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev()));
// _prev->setFixedWidth( 20 ); // _prev->setFixedWidth( 20 );
// //
// _next = new TQToolButton(TQString::fromLatin1(">"), this); // _next = new TQToolButton(TQString::fromLatin1(">"), this);
// tqlayout->addWidget( _next ); // layout->addWidget( _next );
// connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext())); // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext()));
// _next->setFixedWidth( 20 ); // _next->setFixedWidth( 20 );
// //
// _last = new TQToolButton(TQString::fromLatin1(">>"), this); // _last = new TQToolButton(TQString::fromLatin1(">>"), this);
// tqlayout->addWidget( _last ); // layout->addWidget( _last );
// connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast())); // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast()));
// _last->setFixedWidth( 25 ); // _last->setFixedWidth( 25 );
// Same as above // Same as above
// TQLabel* label = new TQLabel( i18n("Matches: "), this ); // TQLabel* label = new TQLabel( i18n("Matches: "), this );
// tqlayout->addWidget( label ); // layout->addWidget( label );
// _matches = new TQLabel(i18n("-"), this ); // _matches = new TQLabel(i18n("-"), this );
// tqlayout->addWidget( _matches ); // layout->addWidget( _matches );
// TQString txt = i18n( "Shows number of times regular expression matches the text in the verifier window"); // TQString txt = i18n( "Shows number of times regular expression matches the text in the verifier window");
// TQToolTip::add( label, txt ); // TQToolTip::add( label, txt );
// TQToolTip::add( _matches, txt ); // TQToolTip::add( _matches, txt );

20
ksim/generalprefs.cpp
Unescape View File

@ -50,7 +50,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
m_sizeBox->setTitle(i18n("Graph Size")); m_sizeBox->setTitle(i18n("Graph Size"));
m_sizeBox->setColumnLayout(0, Qt::Horizontal); m_sizeBox->setColumnLayout(0, Qt::Horizontal);
TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->tqlayout()); TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout());
sizeBoxLayout->setSpacing(6); sizeBoxLayout->setSpacing(6);
m_sizeHLabel = new TQLabel(m_sizeBox); m_sizeHLabel = new TQLabel(m_sizeBox);
@ -211,9 +211,9 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
m_uptimeBox = new TQGroupBox(this); m_uptimeBox = new TQGroupBox(this);
m_uptimeBox->setTitle(i18n("Uptime Legend")); m_uptimeBox->setTitle(i18n("Uptime Legend"));
m_uptimeBox->setColumnLayout(0, Qt::Vertical); m_uptimeBox->setColumnLayout(0, Qt::Vertical);
m_uptimeBox->tqlayout()->setSpacing(0); m_uptimeBox->layout()->setSpacing(0);
m_uptimeBox->tqlayout()->setMargin(0); m_uptimeBox->layout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout()); m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout());
m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6); m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11); m_boxLayout->setMargin(11);
@ -347,9 +347,9 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
m_memBox = new TQGroupBox(this); m_memBox = new TQGroupBox(this);
m_memBox->setTitle(i18n("Memory Legend")); m_memBox->setTitle(i18n("Memory Legend"));
m_memBox->setColumnLayout(0, Qt::Vertical); m_memBox->setColumnLayout(0, Qt::Vertical);
m_memBox->tqlayout()->setSpacing(0); m_memBox->layout()->setSpacing(0);
m_memBox->tqlayout()->setMargin(0); m_memBox->layout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout()); m_boxLayout = new TQVBoxLayout(m_memBox->layout());
m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6); m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11); m_boxLayout->setMargin(11);
@ -496,9 +496,9 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
m_swapBox = new TQGroupBox(this); m_swapBox = new TQGroupBox(this);
m_swapBox->setTitle(i18n("Swap Legend")); m_swapBox->setTitle(i18n("Swap Legend"));
m_swapBox->setColumnLayout(0, Qt::Vertical); m_swapBox->setColumnLayout(0, Qt::Vertical);
m_swapBox->tqlayout()->setSpacing(0); m_swapBox->layout()->setSpacing(0);
m_swapBox->tqlayout()->setMargin(0); m_swapBox->layout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout()); m_boxLayout = new TQVBoxLayout(m_swapBox->layout());
m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6); m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11); m_boxLayout->setMargin(11);

2
ksim/library/chart.cpp
Unescape View File

@ -264,7 +264,7 @@ void KSim::Chart::configureObject(bool repaintWidget)
} }
// Update our geometry if we need to let any // Update our geometry if we need to let any
// tqlayout know about our sizeHint() change // layout know about our sizeHint() change
if (oldSize != sizeHint()) { if (oldSize != sizeHint()) {
// Using resize() here seems to be needed // Using resize() here seems to be needed
resize(sizeHint()); resize(sizeHint());

4
ksim/library/label.cpp
Unescape View File

@ -232,7 +232,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect,
if (!pixmap().isNull()) if (!pixmap().isNull())
location.setX(pixmap().width() + 5); location.setX(pixmap().width() + 5);
tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true, style().drawItem(painter, location, AlignCenter, colorGroup(), true,
0, text, -1, &color); 0, text, -1, &color);
} }
@ -242,7 +242,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect,
TQRect location(rect); TQRect location(rect);
location.setWidth(pixmap.width()); location.setWidth(pixmap.width());
tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true, style().drawItem(painter, location, AlignCenter, colorGroup(), true,
pixmap.isNull() ? 0 : &pixmap, TQString()); pixmap.isNull() ? 0 : &pixmap, TQString());
} }

6
ksim/library/themeloader.cpp
Unescape View File

@ -217,7 +217,7 @@ TQRect KSim::Theme::frameRightBorder(const TQRect &defValue) const
TQColor KSim::Theme::chartInColour(const TQColor &defValue) const TQColor KSim::Theme::chartInColour(const TQColor &defValue) const
{ {
if (d->recolour) if (d->recolour)
return TQApplication::tqpalette().active().background(); return TQApplication::palette().active().background();
return internalColourEntry("chart_in_color", defValue); return internalColourEntry("chart_in_color", defValue);
} }
@ -230,7 +230,7 @@ TQColor KSim::Theme::chartInColourGrid(const TQColor &defValue) const
TQColor KSim::Theme::chartOutColour(const TQColor &defValue) const TQColor KSim::Theme::chartOutColour(const TQColor &defValue) const
{ {
if (d->recolour) if (d->recolour)
return TQApplication::tqpalette().active().background(); return TQApplication::palette().active().background();
return internalColourEntry("chart_out_color", defValue); return internalColourEntry("chart_out_color", defValue);
} }
@ -948,7 +948,7 @@ void KSim::ThemeLoader::reColourImage(TQImage &image)
if (!d->recolour || image.isNull()) if (!d->recolour || image.isNull())
return; return;
TQColor color = TQApplication::tqpalette().active().background(); TQColor color = TQApplication::palette().active().background();
TQImage output(image.width(), image.height(), 32); TQImage output(image.width(), image.height(), 32);
output.setAlphaBuffer(image.hasAlphaBuffer()); output.setAlphaBuffer(image.hasAlphaBuffer());

16
ksim/monitors/cpu/ksimcpu.cpp
Unescape View File

@ -377,26 +377,26 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
mainLayout->addWidget( m_listView ); mainLayout->addWidget( m_listView );
TQHBoxLayout * tqlayout = new TQHBoxLayout; TQHBoxLayout * layout = new TQHBoxLayout;
tqlayout->setSpacing( 6 ); layout->setSpacing( 6 );
TQSpacerItem * spacer = new TQSpacerItem( 20, 20, TQSpacerItem * spacer = new TQSpacerItem( 20, 20,
TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout->addItem(spacer); layout->addItem(spacer);
m_modify = new TQPushButton( this ); m_modify = new TQPushButton( this );
m_modify->setText( i18n( "Modify..." ) ); m_modify->setText( i18n( "Modify..." ) );
connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
tqlayout->addWidget( m_modify ); layout->addWidget( m_modify );
mainLayout->addLayout( tqlayout ); mainLayout->addLayout( layout );
m_legendBox = new TQGroupBox(this); m_legendBox = new TQGroupBox(this);
m_legendBox->setColumnLayout(0, Qt::Vertical); m_legendBox->setColumnLayout(0, Qt::Vertical);
m_legendBox->setTitle(i18n("Chart Legend")); m_legendBox->setTitle(i18n("Chart Legend"));
m_legendBox->tqlayout()->setSpacing(0); m_legendBox->layout()->setSpacing(0);
m_legendBox->tqlayout()->setMargin(0); m_legendBox->layout()->setMargin(0);
m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout()); m_legendLayout = new TQVBoxLayout(m_legendBox->layout());
m_legendLayout->setAlignment(TQt::AlignTop); m_legendLayout->setAlignment(TQt::AlignTop);
m_legendLayout->setSpacing(6); m_legendLayout->setSpacing(6);
m_legendLayout->setMargin(11); m_legendLayout->setMargin(11);

12
ksim/monitors/disk/ksimdisk.cpp
Unescape View File

@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
m_listview->addColumn(i18n("Disks")); m_listview->addColumn(i18n("Disks"));
m_layout->addWidget(m_listview); m_layout->addWidget(m_listview);
TQHBoxLayout *tqlayout = new TQHBoxLayout; TQHBoxLayout *layout = new TQHBoxLayout;
tqlayout->setSpacing(6); layout->setSpacing(6);
TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSpacerItem *spacer = new TQSpacerItem(20, 20,
TQSizePolicy::Expanding, TQSizePolicy::Minimum); TQSizePolicy::Expanding, TQSizePolicy::Minimum);
tqlayout->addItem(spacer); layout->addItem(spacer);
m_add = new TQPushButton(this); m_add = new TQPushButton(this);
m_add->setText(i18n("Add...")); m_add->setText(i18n("Add..."));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
tqlayout->addWidget(m_add); layout->addWidget(m_add);
m_remove = new TQPushButton(this); m_remove = new TQPushButton(this);
m_remove->setText(i18n("Remove")); m_remove->setText(i18n("Remove"));
connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
tqlayout->addWidget(m_remove); layout->addWidget(m_remove);
m_layout->addLayout(tqlayout); m_layout->addLayout(layout);
m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this); m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this);
m_layout->addWidget(m_buttonBox); m_layout->addWidget(m_buttonBox);

20
ksim/monitors/i8k/ksimi8k.cpp
Unescape View File

@ -151,15 +151,15 @@ void I8KView::closeStream()
void I8KView::initGUI() void I8KView::initGUI()
{ {
TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); TQVBoxLayout *layout = new TQVBoxLayout( this );
m_fan1Label = new KSim::Label( this ); m_fan1Label = new KSim::Label( this );
m_fan2Label = new KSim::Label( this ); m_fan2Label = new KSim::Label( this );
m_tempLabel = new KSim::Label( this ); m_tempLabel = new KSim::Label( this );
tqlayout->addWidget( m_fan1Label ); layout->addWidget( m_fan1Label );
tqlayout->addWidget( m_fan2Label ); layout->addWidget( m_fan2Label );
tqlayout->addWidget( m_tempLabel ); layout->addWidget( m_tempLabel );
} }
void I8KView::updateView() void I8KView::updateView()
@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
m_interval->setRange( 2, 60, 1, true ); m_interval->setRange( 2, 60, 1, true );
m_interval->setSuffix( i18n( " sec" ) ); m_interval->setSuffix( i18n( " sec" ) );
TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0,
KDialog::spacingHint() ); KDialog::spacingHint() );
tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 ); layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
tqlayout->addWidget( label, 1, 0 ); layout->addWidget( label, 1, 0 );
tqlayout->addWidget( m_interval, 1, 1 ); layout->addWidget( m_interval, 1, 1 );
tqlayout->setColStretch( 1, 1 ); layout->setColStretch( 1, 1 );
tqlayout->setRowStretch( 2, 1 ); layout->setRowStretch( 2, 1 );
} }
I8KConfig::~I8KConfig() I8KConfig::~I8KConfig()

4
ksim/monitors/mail/ksimmail.cpp
Unescape View File

@ -69,10 +69,10 @@ void MailPlugin::showAbout()
MailView::MailView( KSim::PluginObject* parent, const char* name ) MailView::MailView( KSim::PluginObject* parent, const char* name )
: KSim::PluginView( parent, name ) : KSim::PluginView( parent, name )
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); TQVBoxLayout* layout = new TQVBoxLayout( this );
MailLabel* label = new MailLabel( this ); MailLabel* label = new MailLabel( this );
tqlayout->addWidget( label, 0, AlignHCenter ); layout->addWidget( label, 0, AlignHCenter );
} }
MailView::~MailView() MailView::~MailView()

14
ksim/monitors/net/netconfig.cpp
Unescape View File

@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
TQT_SLOT(modifyItem(TQListViewItem *))); TQT_SLOT(modifyItem(TQListViewItem *)));
mainLayout->addWidget(usingBox); mainLayout->addWidget(usingBox);
tqlayout = new TQHBoxLayout; layout = new TQHBoxLayout;
tqlayout->setSpacing(6); layout->setSpacing(6);
TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSpacerItem *spacer = new TQSpacerItem(20, 20,
TQSizePolicy::Expanding, TQSizePolicy::Minimum); TQSizePolicy::Expanding, TQSizePolicy::Minimum);
tqlayout->addItem(spacer); layout->addItem(spacer);
insertButton = new TQPushButton(this); insertButton = new TQPushButton(this);
insertButton->setText(i18n("Add...")); insertButton->setText(i18n("Add..."));
connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
tqlayout->addWidget(insertButton); layout->addWidget(insertButton);
modifyButton = new TQPushButton(this); modifyButton = new TQPushButton(this);
modifyButton->setText(i18n("Modify...")); modifyButton->setText(i18n("Modify..."));
connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
tqlayout->addWidget(modifyButton); layout->addWidget(modifyButton);
removeButton = new TQPushButton(this); removeButton = new TQPushButton(this);
removeButton->setText(i18n("Remove")); removeButton->setText(i18n("Remove"));
connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
tqlayout->addWidget(removeButton); layout->addWidget(removeButton);
mainLayout->addLayout(tqlayout); mainLayout->addLayout(layout);
} }
NetConfig::~NetConfig() NetConfig::~NetConfig()

2
ksim/monitors/net/netconfig.h
Unescape View File

@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage
// Couldnt think of a better name for this :) // Couldnt think of a better name for this :)
const TQString &boolToString(bool) const; const TQString &boolToString(bool) const;
TQHBoxLayout *tqlayout; TQHBoxLayout *layout;
TQPushButton *insertButton; TQPushButton *insertButton;
TQPushButton *removeButton; TQPushButton *removeButton;
TQPushButton *modifyButton; TQPushButton *modifyButton;

6
ksim/monitors/net/netdialog.cpp
Unescape View File

@ -86,9 +86,9 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_timerBox = new TQGroupBox(m_generalTab); m_timerBox = new TQGroupBox(m_generalTab);
m_timerBox->setTitle(i18n("Timer")); m_timerBox->setTitle(i18n("Timer"));
m_timerBox->setColumnLayout(0, Qt::Vertical); m_timerBox->setColumnLayout(0, Qt::Vertical);
m_timerBox->tqlayout()->setSpacing(0); m_timerBox->layout()->setSpacing(0);
m_timerBox->tqlayout()->setMargin(0); m_timerBox->layout()->setMargin(0);
m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout()); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout());
m_timerBoxLayout->setAlignment(TQt::AlignTop); m_timerBoxLayout->setAlignment(TQt::AlignTop);
m_timerBoxLayout->setSpacing(6); m_timerBoxLayout->setSpacing(6);
m_timerBoxLayout->setMargin(11); m_timerBoxLayout->setMargin(11);

4
ksim/monitors/snmp/browsedialogbase.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -157,7 +157,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
ksim/monitors/snmp/hostdialogbase.ui
Unescape View File

@ -384,7 +384,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5"> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
ksim/monitors/snmp/monitordialogbase.ui
Unescape View File

@ -112,7 +112,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -174,7 +174,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
ksim/monitors/snmp/session.cpp
Unescape View File

@ -54,7 +54,7 @@ Session::Session( const HostConfig &source )
d->source = source; d->source = source;
// tqunicode madness // unicode madness
d->host = source.name.ascii(); d->host = source.name.ascii();
d->community = source.community.ascii(); d->community = source.community.ascii();
d->securityName = source.securityName.ascii(); d->securityName = source.securityName.ascii();

2
kwallet/kbetterthankdialogbase.ui
Unescape View File

@ -46,7 +46,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
kwallet/konfigurator/walletconfigwidget.ui
Unescape View File

@ -64,7 +64,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

6
kwallet/kwalleteditor.cpp
Unescape View File

@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
setCaption(wallet); setCaption(wallet);
TQTimer::singleShot(0, this, TQT_SLOT(tqlayout())); TQTimer::singleShot(0, this, TQT_SLOT(layout()));
} }
KWalletEditor::~KWalletEditor() { KWalletEditor::~KWalletEditor() {
@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() {
} }
} }
void KWalletEditor::tqlayout() { void KWalletEditor::layout() {
TQValueList<int> sz = _ww->_splitter->sizes(); TQValueList<int> sz = _ww->_splitter->sizes();
int sum = sz[0] + sz[1]; int sum = sz[0] + sz[1];
sz[0] = sum/2; sz[0] = sum/2;
@ -617,7 +617,7 @@ void KWalletEditor::copyPassword() {
if (_w && item) { if (_w && item) {
TQString pass; TQString pass;
if (_w->readPassword(item->text(0), pass) == 0) { if (_w->readPassword(item->text(0), pass) == 0) {
TQApplication::tqclipboard()->setText(pass); TQApplication::clipboard()->setText(pass);
} }
} }
} }

2
kwallet/kwalleteditor.h
Unescape View File

@ -52,7 +52,7 @@ class KWalletEditor : public KMainWindow {
void deleteFolder(); void deleteFolder();
private slots: private slots:
void tqlayout(); void layout();
void updateFolderList(bool checkEntries = false); void updateFolderList(bool checkEntries = false);
void entrySelectionChanged(TQListViewItem *item); void entrySelectionChanged(TQListViewItem *item);
void listItemRenamed(TQListViewItem *, int, const TQString&); void listItemRenamed(TQListViewItem *, int, const TQString&);

2
kwallet/kwmapeditor.cpp
Unescape View File

@ -125,7 +125,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
void KWMapEditor::copy() { void KWMapEditor::copy() {
TQApplication::tqclipboard()->setText(text(_contextRow, 2)); TQApplication::clipboard()->setText(text(_contextRow, 2));
} }

4
kwallet/walletwidget.ui
Unescape View File

@ -47,7 +47,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -105,7 +105,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
superkaramba/examples/richtext/richtext.py
Unescape View File

@ -1,6 +1,6 @@
#Unicode Example #Unicode Example
#For Symbol Tables look at www.tqunicode.org/charts/ #For Symbol Tables look at www.unicode.org/charts/
hidden = 0 hidden = 0
@ -35,7 +35,7 @@ is used to encode the formatting commands.</p>
<li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li> <li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li>
<li>Links can also <a href="#trigger">trigger</a> actions in the script</li> <li>Links can also <a href="#trigger">trigger</a> actions in the script</li>
<li><i>Various</i> <b>different</b> <u>caracter</u> <s>styles</s></li> <li><i>Various</i> <b>different</b> <u>caracter</u> <s>styles</s></li>
<li><a href="kfmclient openURL http://www.tqunicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li> <li><a href="kfmclient openURL http://www.unicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li>
<li>Simple Tables: <li>Simple Tables:
<table bgcolor="darkgray" border="1" width="80%"> <table bgcolor="darkgray" border="1" width="80%">
<tr><th colspan="3">Header</th></tr> <tr><th colspan="3">Header</th></tr>

2
superkaramba/examples/test_all.sh
Unescape View File

@ -10,7 +10,7 @@ themes=(
"richtext/richtext.theme" "richtext/richtext.theme"
"richtext/rtext.theme" "richtext/rtext.theme"
"globalMouse/eyes.theme" "globalMouse/eyes.theme"
"tqunicode/tqunicode.theme" "unicode/unicode.theme"
"mouseDrag/karmix/karmix.theme" "mouseDrag/karmix/karmix.theme"
"input_api/input_api.theme" "input_api/input_api.theme"
"input_example/input_example.theme" "input_example/input_example.theme"

6
superkaramba/examples/unicode/unicode.py
Unescape View File

@ -1,6 +1,6 @@
#Unicode Example #Unicode Example
#For Symbol Tables look at www.tqunicode.org/charts/ #For Symbol Tables look at www.unicode.org/charts/
#this import statement allows access to the karamba functions #this import statement allows access to the karamba functions
@ -31,8 +31,8 @@ def initWidget(widget):
\u0631\u0632\u0633\u0634\u0635\u0636\u0637\u0638\u0639\u063A\u0641\u0642\u0643\u0644\u0645\u0646 \u0631\u0632\u0633\u0634\u0635\u0636\u0637\u0638\u0639\u063A\u0641\u0642\u0643\u0644\u0645\u0646
\u0647\u0648\u064A \u0647\u0648\u064A
<p> <p>
For a complete reference on tqunicode caracter codes look at: For a complete reference on unicode caracter codes look at:
<center><a href="kfmclient openURL http://www.tqunicode.org/charts/">www.tqunicode.org/charts/</a></center> <center><a href="kfmclient openURL http://www.unicode.org/charts/">www.unicode.org/charts/</a></center>
</p> </p>
""" """
karamba.resizeWidget(widget, 400, 400) karamba.resizeWidget(widget, 400, 400)

2
superkaramba/src/karamba_python.cpp
Unescape View File

@ -214,7 +214,7 @@ static PyMethodDef karamba_methods[] = {
{(char*)"showSystray", py_show_systray, METH_VARARGS, (char*)"Show the Systray"}, {(char*)"showSystray", py_show_systray, METH_VARARGS, (char*)"Show the Systray"},
{(char*)"moveSystray", py_move_systray, METH_VARARGS, (char*)"Move the Systray"}, {(char*)"moveSystray", py_move_systray, METH_VARARGS, (char*)"Move the Systray"},
{(char*)"getCurrentWindowCount", py_get_current_window_count, METH_VARARGS, (char*)"Get current Window count"}, {(char*)"getCurrentWindowCount", py_get_current_window_count, METH_VARARGS, (char*)"Get current Window count"},
{(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray tqlayout"}, {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray layout"},
// Misc - misc_python.cpp // Misc - misc_python.cpp
{(char*)"getThemePath", py_get_theme_path, METH_VARARGS, (char*)"Get the file path of the theme"}, {(char*)"getThemePath", py_get_theme_path, METH_VARARGS, (char*)"Get the file path of the theme"},

2
superkaramba/src/themes_layout.ui
Unescape View File

@ -27,7 +27,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
superkaramba/src/xmmssensor.cpp
Unescape View File

@ -164,9 +164,9 @@ void XMMSSensor::update()
{ {
isPlaying = xmms->isPlaying(0); isPlaying = xmms->isPlaying(0);
pos = xmms->getPlaylistPos(0); pos = xmms->getPlaylistPos(0);
qDebug("tqunicode start"); qDebug("unicode start");
title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) ) ); title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) ) );
qDebug("tqunicode end"); qDebug("unicode end");
if( title.isEmpty() ) if( title.isEmpty() )
title = "XMMS"; title = "XMMS";

Write Preview
Loading…
Cancel
Save