Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent c3509de54b
commit 9b8c9f1f9e

@ -75,5 +75,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -63,13 +63,13 @@ KAboutData *ArkPart::createAboutData()
ArkPart::ArkPart( TQWidget *tqparentWidget, const char * /*widgetName*/, TQObject *tqparent, ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent,
const char *name, const TQStringList &, bool readWrite ) const char *name, const TQStringList &, bool readWrite )
: KParts::ReadWritePart(tqparent, name) : KParts::ReadWritePart(tqparent, name)
{ {
kdDebug(1601)<<"ArkPart::ArkPart"<<endl; kdDebug(1601)<<"ArkPart::ArkPart"<<endl;
setInstance(ArkFactory::instance()); setInstance(ArkFactory::instance());
awidget = new ArkWidget( tqparentWidget, "ArkWidget" ); awidget = new ArkWidget( parentWidget, "ArkWidget" );
setWidget(awidget); setWidget(awidget);
connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) ); connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) );

@ -90,7 +90,7 @@ class ArkPart: public KParts::ReadWritePart
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ArkPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList &, bool readWrite ); const char *name, const TQStringList &, bool readWrite );
virtual ~ArkPart(); virtual ~ArkPart();

@ -38,7 +38,7 @@ ArkFactory::~ArkFactory()
s_instance = 0L; s_instance = 0L;
} }
KParts::Part * ArkFactory::createPartObject( TQWidget *tqparentWidget, KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
const char *widgetName, TQObject *tqparent, const char *widgetName, TQObject *tqparent,
const char *name, const char *classname, const char *name, const char *classname,
const TQStringList &args ) const TQStringList &args )
@ -49,7 +49,7 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *tqparentWidget,
{ {
readWrite = true; readWrite = true;
} }
ArkPart* obj = new ArkPart( tqparentWidget, widgetName, tqparent, name, ArkPart* obj = new ArkPart( parentWidget, widgetName, tqparent, name,
args, readWrite ); args, readWrite );
//kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl; //kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl;
return obj; return obj;

@ -29,7 +29,7 @@ public:
ArkFactory() : KParts::Factory() {} ArkFactory() : KParts::Factory() {}
virtual ~ArkFactory(); virtual ~ArkFactory();
virtual KParts::Part *createPartObject( virtual KParts::Part *createPartObject(
TQWidget *tqparentWidget = 0,const char *widgetName = 0, TQWidget *parentWidget = 0,const char *widgetName = 0,
TQObject *tqparent = 0, const char *name = 0, TQObject *tqparent = 0, const char *name = 0,
const char *classname = "KParts::Part", const char *classname = "KParts::Part",
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );

@ -75,5 +75,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -513,8 +513,8 @@ FileLVI* FileListView::findParent( const TQString& fullname )
return static_cast< FileLVI* >( 0 ); return static_cast< FileLVI* >( 0 );
// Get a list of ancestors // Get a list of ancestors
TQString tqparentFullname = name.left( name.tqfindRev( '/' ) ); TQString parentFullname = name.left( name.tqfindRev( '/' ) );
TQStringList ancestorList = TQStringList::split( '/', tqparentFullname ); TQStringList ancestorList = TQStringList::split( '/', parentFullname );
// Checks if the listview contains the first item in the list of ancestors // Checks if the listview contains the first item in the list of ancestors
TQListViewItem *item = firstChild(); TQListViewItem *item = firstChild();

@ -89,5 +89,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -274,5 +274,5 @@
<tabstop>kcfg_MemoryButtonsColor</tabstop> <tabstop>kcfg_MemoryButtonsColor</tabstop>
<tabstop>kcfg_OperationButtonsColor</tabstop> <tabstop>kcfg_OperationButtonsColor</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -479,7 +479,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -195,5 +195,5 @@
<tabstop>kcfg_Beep</tabstop> <tabstop>kcfg_Beep</tabstop>
<tabstop>kcfg_CaptionResult</tabstop> <tabstop>kcfg_CaptionResult</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -155,7 +155,7 @@ KCalculator::KCalculator(TQWidget *tqparent, const char *name)
// Create Calculator Buttons // Create Calculator Buttons
// //
// First the widgets that are the tqparents of the buttons // First the widgets that are the parents of the buttons
mSmallPage = new TQWidget(central); mSmallPage = new TQWidget(central);
mLargePage = new TQWidget(central); mLargePage = new TQWidget(central);
mNumericPage = setupNumericKeys(central); mNumericPage = setupNumericKeys(central);
@ -228,7 +228,7 @@ KCalculator::KCalculator(TQWidget *tqparent, const char *name)
// //
// All these tqlayouts are needed because all the groups have their // All these layouts are needed because all the groups have their
// own size per row so we can't use one huge TQGridLayout (mosfet) // own size per row so we can't use one huge TQGridLayout (mosfet)
// //
TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 4, 0, TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 4, 0,

@ -1588,7 +1588,7 @@
<slot>slotParameterChanged()</slot> <slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot> <slot>updateOptions()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -1274,7 +1274,7 @@
<slot>slotParameterChanged()</slot> <slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot> <slot>updateOptions()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -293,7 +293,7 @@
<slot>slotCheckText(const QString &amp;)</slot> <slot>slotCheckText(const QString &amp;)</slot>
<slot>slotClearIcon()</slot> <slot>slotClearIcon()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kicondialog.h</includehint> <includehint>kicondialog.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -490,7 +490,7 @@
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -149,7 +149,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>slotTextChanged( const TQString &amp; newText )</slot> <slot>slotTextChanged( const TQString &amp; newText )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -119,7 +119,7 @@
<slot>reject()</slot> <slot>reject()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -122,7 +122,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>
</includehints> </includehints>

@ -119,5 +119,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>settingsWrapMode( int mode )</slot> <slot>settingsWrapMode( int mode )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -60,5 +60,5 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -65,5 +65,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>use_agent_toggled( bool isOn )</slot> <slot>use_agent_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -313,7 +313,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>allow_custom_option_toggled( bool isOn )</slot> <slot>allow_custom_option_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -205,7 +205,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -409,5 +409,5 @@ the original file.</string>
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -110,7 +110,7 @@ all others will be stored for use by KGpg only.</string>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>

@ -168,7 +168,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>

@ -205,7 +205,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
</includehints> </includehints>

@ -135,7 +135,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>checkFile_toggled( bool isOn )</slot> <slot>checkFile_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
</includehints> </includehints>

@ -495,7 +495,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>

@ -332,5 +332,5 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -145,7 +145,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>cbSave_toggled( bool isOn )</slot> <slot>cbSave_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
</includehints> </includehints>

@ -397,7 +397,7 @@ Remember that if you download a file or open one in an editor, parts of the file
<Q_SLOTS> <Q_SLOTS>
<slot>finishButton_clicked()</slot> <slot>finishButton_clicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -2052,24 +2052,24 @@ void listKeys::delsignkey()
return; return;
} }
TQString signID,tqparentKey,signMail,tqparentMail; TQString signID,parentKey,signMail,parentMail;
////////////////// open a key selection dialog (KgpgSelKey, see begining of this file) ////////////////// open a key selection dialog (KgpgSelKey, see begining of this file)
tqparentKey=keysList2->currentItem()->tqparent()->text(6); parentKey=keysList2->currentItem()->tqparent()->text(6);
signID=keysList2->currentItem()->text(6); signID=keysList2->currentItem()->text(6);
tqparentMail=keysList2->currentItem()->tqparent()->text(0)+" ("+keysList2->currentItem()->tqparent()->text(1)+")"; parentMail=keysList2->currentItem()->tqparent()->text(0)+" ("+keysList2->currentItem()->tqparent()->text(1)+")";
signMail=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")"; signMail=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")";
if (tqparentKey==signID) { if (parentKey==signID) {
KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature.")); KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature."));
return; return;
} }
TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").tqarg(signMail).tqarg(tqparentMail); TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").tqarg(signMail).tqarg(parentMail);
if (KMessageBox::questionYesNo(this,ask,TQString(),KStdGuiItem::del(),KStdGuiItem::cancel())!=KMessageBox::Yes) if (KMessageBox::questionYesNo(this,ask,TQString(),KStdGuiItem::del(),KStdGuiItem::cancel())!=KMessageBox::Yes)
return; return;
KgpgInterface *delSignKeyProcess=new KgpgInterface(); KgpgInterface *delSignKeyProcess=new KgpgInterface();
delSignKeyProcess->KgpgDelSignature(tqparentKey,signID); delSignKeyProcess->KgpgDelSignature(parentKey,signID);
connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool))); connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool)));
} }

@ -192,5 +192,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>CBsave_toggled( bool isOn )</slot> <slot>CBsave_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -167,16 +167,16 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqpare
"box enables you to use any key, even if it has not be signed.")); "box enables you to use any key, even if it has not be signed."));
if (filemode) { if (filemode) {
TQWidget *tqparentBox=new TQWidget(boutonboxoptions); TQWidget *parentBox=new TQWidget(boutonboxoptions);
TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0);
//shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setFrameStyle(TQFrame::NoFrame);
//shredBox->setMargin(0); //shredBox->setMargin(0);
CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); CBshred=new TQCheckBox(i18n("Shred source file"),parentBox);
TQWhatsThis::add TQWhatsThis::add
(CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible")); (CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible"));
TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this 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>"); TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this 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>");
KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),tqparentBox ); KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox );
shredBox->addWidget(CBshred); shredBox->addWidget(CBshred);
shredBox->addWidget(warn); shredBox->addWidget(warn);
} }

@ -116,7 +116,7 @@
<tabstop>kLVsearch</tabstop> <tabstop>kLVsearch</tabstop>
<tabstop>kLEID</tabstop> <tabstop>kLEID</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -103,7 +103,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>checkFile_toggled( bool isOn )</slot> <slot>checkFile_toggled( bool isOn )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -323,7 +323,7 @@ int SFilterControl::execute( uchar *dest, uchar *src, uint size )
// A short description so that I will understand what the // A short description so that I will understand what the
// h... is going on five minutes from now. // h... is going on five minutes from now.
// //
// Destination byte is tqmasked (AND'ed) with the inverse bitmap // Destination byte is masked (AND'ed) with the inverse bitmap
// (the noninversed bitmap contains position of the // (the noninversed bitmap contains position of the
// two swap bits, eg 7-2 gives 10000100). Then the destination // two swap bits, eg 7-2 gives 10000100). Then the destination
// is OR'ed with the swapped bitmap. // is OR'ed with the swapped bitmap.

@ -66,8 +66,8 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *tqparent, const char *name )
connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) ); connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) );
connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), TQT_SLOT( fontChanged() ) );
connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) ); connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) );
connect( mHexView, TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ), connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) ); TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
@ -398,7 +398,7 @@ void CHexEditorWidget::paletteChanged( void )
setColor( mDisplayState.color ); setColor( mDisplayState.color );
} }
void CHexEditorWidget::tqlayoutChanged( const SDisplayLayout &/*tqlayout*/ ) void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ )
{ {
//mDisplayState.tqlayout = tqlayout; //mDisplayState.tqlayout = tqlayout;
} }
@ -1932,7 +1932,7 @@ void CHexEditorWidget::options( void )
connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)),
TQT_SLOT(setLineSize(const SDisplayLine &)) ); TQT_SLOT(setLineSize(const SDisplayLine &)) );
connect( mOptionDialog, TQT_SIGNAL(tqlayoutChoice(const SDisplayLayout &)), connect( mOptionDialog, TQT_SIGNAL(layoutChoice(const SDisplayLayout &)),
TQT_SLOT(setLayout(const SDisplayLayout &)) ); TQT_SLOT(setLayout(const SDisplayLayout &)) );
connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)), connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)),
TQT_SLOT(setFont(const SDisplayFont &)) ); TQT_SLOT(setFont(const SDisplayFont &)) );

@ -170,7 +170,7 @@ class CHexEditorWidget : public TQWidget
protected slots: protected slots:
void fontChanged( void ); void fontChanged( void );
void paletteChanged( void ); void paletteChanged( void );
void tqlayoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &tqlayout );
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 &tqlayout );

@ -297,7 +297,7 @@ void CTabBar::removeName( const TQString &name )
{ {
mFileList.remove(it); mFileList.remove(it);
removeTab(t); removeTab(t);
tqlayoutTabs(); layoutTabs();
break; break;
} }
} }
@ -323,7 +323,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName )
mFileList.remove(it); mFileList.remove(it);
mFileList.append( CFileKey(newName,t->identifier()) ); mFileList.append( CFileKey(newName,t->identifier()) );
tqlayoutTabs(); layoutTabs();
update(); // Seems to be necessary update(); // Seems to be necessary
break; break;
} }

@ -272,7 +272,7 @@ int CHexViewWidget::insertFile( TQFile &file, CProgress &p )
emit dataChanged(); emit dataChanged();
emit cursorChanged( mHexBuffer->cursorState() ); emit cursorChanged( mHexBuffer->cursorState() );
emit tqlayoutChanged( mLayout ); emit layoutChanged( mLayout );
return( Err_Success ); return( Err_Success );
} }
@ -371,7 +371,7 @@ void CHexViewWidget::setBuffer( CHexBuffer *hexBuffer )
emit cursorChanged( mHexBuffer->cursorState() ); emit cursorChanged( mHexBuffer->cursorState() );
emit fileState( mHexBuffer->fileState() ); emit fileState( mHexBuffer->fileState() );
emit encodingChanged( mHexBuffer->encoding() ); emit encodingChanged( mHexBuffer->encoding() );
emit tqlayoutChanged( mLayout ); emit layoutChanged( mLayout );
emit inputModeChanged( mHexBuffer->inputMode() ); emit inputModeChanged( mHexBuffer->inputMode() );
emit fileName( mHexBuffer->url(), mHexBuffer->hasFileName() ); emit fileName( mHexBuffer->url(), mHexBuffer->hasFileName() );
emit bookmarkChanged( mHexBuffer->bookmarkList() ); emit bookmarkChanged( mHexBuffer->bookmarkList() );
@ -722,7 +722,7 @@ void CHexViewWidget::setLayout( SDisplayLayout &tqlayout )
mHexBuffer->setLayout( mLayout ); mHexBuffer->setLayout( mLayout );
updateWindow(); updateWindow();
emit tqlayoutChanged( mLayout ); emit layoutChanged( mLayout );
emit cursorChanged( mHexBuffer->cursorState() ); emit cursorChanged( mHexBuffer->cursorState() );
emit textWidth( defaultWidth() ); emit textWidth( defaultWidth() );
} }

@ -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 tqlayoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &tqlayout );
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 );

@ -789,7 +789,7 @@ void COptionDialog::slotApply( void )
l.horzGridWidth = l.vertGridWidth = 1; l.horzGridWidth = l.vertGridWidth = 1;
} }
emit tqlayoutChoice( mDisplayState.tqlayout ); emit layoutChoice( mDisplayState.tqlayout );
} }
break; break;

@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase
signals: signals:
void lineSizeChoice( const SDisplayLine &lineSize ); void lineSizeChoice( const SDisplayLine &lineSize );
void tqlayoutChoice( const SDisplayLayout &tqlayout ); void layoutChoice( const SDisplayLayout &tqlayout );
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 );

@ -34,7 +34,7 @@ class KHexEditPartFactory : public KParts::Factory
virtual ~KHexEditPartFactory(); virtual ~KHexEditPartFactory();
public: public:
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static KInstance* instance();

@ -83,8 +83,8 @@ KHexEdit::KHexEdit( void )
TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) ); TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) );
connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ),
TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) ); TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) );
connect( hexView(), TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ), connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
TQT_TQOBJECT(this), TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) ); TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)),
@ -807,7 +807,7 @@ void KHexEdit::fileState( SFileState &state )
void KHexEdit::tqlayoutChanged( const SDisplayLayout &tqlayout ) void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
{ {
KRadioAction *radioAction; KRadioAction *radioAction;

@ -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 tqlayoutChanged( const SDisplayLayout &tqlayout ); void layoutChanged( const SDisplayLayout &tqlayout );
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 );

@ -366,7 +366,7 @@ void KJotsMain::deleteEntry()
return; return;
} }
KJotsBook* bk = cur->tqparentBook(); KJotsBook* bk = cur->parentBook();
KJotsPage* nxt = dynamic_cast<KJotsPage*>(cur->nextSibling()); KJotsPage* nxt = dynamic_cast<KJotsPage*>(cur->nextSibling());
me_text->setEntry(0); me_text->setEntry(0);
@ -1081,7 +1081,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
//afterFirst doesn't work like we need it to. We want it to point to the //afterFirst doesn't work like we need it to. We want it to point to the
//previous sibling, not just the entry directly above it. //previous sibling, not just the entry directly above it.
if ( afterFirst && afterFirst->tqparent() != entry->tqparentBook() ) if ( afterFirst && afterFirst->tqparent() != entry->parentBook() )
{ {
TQListViewItemIterator it ( afterFirst ); TQListViewItemIterator it ( afterFirst );
afterFirst = 0; afterFirst = 0;
@ -1090,13 +1090,13 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
while ( it.current() ) while ( it.current() )
{ {
//No other items were above this one. //No other items were above this one.
if ( it.current() == entry->tqparentBook() ) if ( it.current() == entry->parentBook() )
{ {
break; break;
} }
//Found a previous sibling! //Found a previous sibling!
if ( it.current()->tqparent() == entry->tqparentBook() ) if ( it.current()->tqparent() == entry->parentBook() )
{ {
afterFirst = it.current(); afterFirst = it.current();
break; break;
@ -1126,7 +1126,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
{ {
//We have to move item back. //We have to move item back.
subjectList->takeItem(item); subjectList->takeItem(item);
entry->tqparentBook()->insertItem(item); entry->parentBook()->insertItem(item);
entry->moveItem(afterFirst); entry->moveItem(afterFirst);
} else { } else {
subjectList->takeItem(item); subjectList->takeItem(item);
@ -1153,7 +1153,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
if ( entryAfter->isBook() ) if ( entryAfter->isBook() )
entryAfter->setDirty(true); entryAfter->setDirty(true);
else else
entryAfter->tqparentBook()->setDirty(true); entryAfter->parentBook()->setDirty(true);
} }
return; return;

@ -31,7 +31,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kfontdialog.h</includehint> <includehint>kfontdialog.h</includehint>
</includehints> </includehints>

@ -145,7 +145,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
</includehints> </includehints>

@ -1052,10 +1052,10 @@ TQString KJotsPage::defaultSubject()
{ {
int page = 0; int page = 0;
if ( tqparentBook() ) if ( parentBook() )
{ {
//We can't use childCount() here because it will count books, too. //We can't use childCount() here because it will count books, too.
KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(tqparentBook()->firstChild()); KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(parentBook()->firstChild());
while ( entry ) while ( entry )
{ {
if ( entry->isPage() ) ++page; if ( entry->isPage() ) ++page;
@ -1192,12 +1192,12 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode )
if ( top != this ) if ( top != this )
{ {
KJotsBook *tqparent = tqparentBook(); KJotsBook *tqparent = parentBook();
while ( tqparent ) while ( tqparent )
{ {
html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject()); html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject());
if ( tqparent == top ) break; if ( tqparent == top ) break;
tqparent = tqparent->tqparentBook(); tqparent = tqparent->parentBook();
} }
} }
html += TQString("</tr></table>"); html += TQString("</tr></table>");

@ -74,7 +74,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem
TQ_UINT64 id() { return m_id; } TQ_UINT64 id() { return m_id; }
void setId(TQ_UINT64); void setId(TQ_UINT64);
KJotsBook *tqparentBook() { return m_parent; } KJotsBook *parentBook() { return m_parent; }
void resetParent(); void resetParent();
bool isBook() const { return m_isBook; } bool isBook() const { return m_isBook; }

@ -708,7 +708,7 @@ quit:
// and which has a transparent background. // and which has a transparent background.
// Unfortunately this required the following twisted code because for some // Unfortunately this required the following twisted code because for some
// reason text that is drawn on a transparent pixmap is invisible // reason text that is drawn on a transparent pixmap is invisible
// (aptqparently the alpha channel isn't changed when the text is drawn). // (apparently the alpha channel isn't changed when the text is drawn).
// Therefore I have to draw the text on a solid background and then remove // Therefore I have to draw the text on a solid background and then remove
// the background by making it transparent with TQPixmap::setMask. This // the background by making it transparent with TQPixmap::setMask. This
// involves the slow createHeuristicMask() function (from the API docs: // involves the slow createHeuristicMask() function (from the API docs:

@ -220,10 +220,10 @@ typedef struct irq_req_t {
#define IRTQ_PULSE_ID 0x40 #define IRTQ_PULSE_ID 0x40
#define IRTQ_SHARE_ID 0x80 #define IRTQ_SHARE_ID 0x80
typedef struct eventtqmask_t { typedef struct eventmask_t {
u_int Attributes; u_int Attributes;
u_int EventMask; u_int EventMask;
} eventtqmask_t; } eventmask_t;
#define CONF_EVENT_MASK_VALID 0x01 #define CONF_EVENT_MASK_VALID 0x01

@ -124,11 +124,11 @@
#endif #endif
#if (LINUX_VERSION_CODE < VERSION(2,1,51)) #if (LINUX_VERSION_CODE < VERSION(2,1,51))
#define INVALIDATE_INODES(r) tqinvalidate_inodes(r) #define INVALIDATE_INODES(r) invalidate_inodes(r)
#else #else
#define INVALIDATE_INODES(r) \ #define INVALIDATE_INODES(r) \
do { struct super_block *sb = get_super(r); \ do { struct super_block *sb = get_super(r); \
if (sb) tqinvalidate_inodes(sb); } while (0) if (sb) invalidate_inodes(sb); } while (0)
#endif #endif
#if (LINUX_VERSION_CODE < VERSION(2,1,60)) #if (LINUX_VERSION_CODE < VERSION(2,1,60))

@ -262,8 +262,8 @@
<Q_SLOTS> <Q_SLOTS>
<slot>slotChanged()</slot> <slot>slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint>
<includehint>kled.h</includehint> <includehint>kled.h</includehint>

@ -82,5 +82,5 @@ Released under the terms of the GNU GPL.</comment>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="2" margin="2"/> <layoutdefaults spacing="2" margin="2"/>
</UI> </UI>

@ -290,8 +290,8 @@
<Q_SLOTS> <Q_SLOTS>
<slot>slotChanged()</slot> <slot>slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -44,7 +44,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to )
void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream ) void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream )
{ {
// Only handle widgets. Alternatives to widgets are tqlayouts, validators, timers, etc. // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) ) if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) )
return; return;
@ -79,7 +79,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre
void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to ) void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to )
{ {
// Only handle widgets. Alternatives to widgets are tqlayouts, validators, timers, etc. // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) ) if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) )
return; return;

@ -280,17 +280,17 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event)
SingleContainerWidget::mouseReleaseEvent( event ); SingleContainerWidget::mouseReleaseEvent( event );
} }
bool CompoundWidget::updateSelection( bool tqparentSelected ) bool CompoundWidget::updateSelection( bool parentSelected )
{ {
if ( _hidden ) { if ( _hidden ) {
bool changed = RegExpWidget::updateSelection( tqparentSelected ); bool changed = RegExpWidget::updateSelection( parentSelected );
_child->selectWidget( _isSelected ); _child->selectWidget( _isSelected );
if (changed) if (changed)
tqrepaint(); tqrepaint();
return changed; return changed;
} }
else { else {
return SingleContainerWidget::updateSelection( tqparentSelected ); return SingleContainerWidget::updateSelection( parentSelected );
} }
} }

@ -68,7 +68,7 @@ public:
CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow,
TQWidget* tqparent, const char* name = 0); TQWidget* tqparent, const char* name = 0);
virtual bool updateSelection( bool tqparentSelected ); virtual bool updateSelection( bool parentSelected );
virtual TQSize tqsizeHint() const; virtual TQSize tqsizeHint() const;
virtual RegExp* regExp() const; virtual RegExp* regExp() const;
virtual RegExpType type() const { return COMPOUND; } virtual RegExpType type() const { return COMPOUND; }

@ -229,10 +229,10 @@ RegExp* ConcWidget::regExp() const
} }
} }
bool ConcWidget::updateSelection(bool tqparentSelected) bool ConcWidget::updateSelection(bool parentSelected)
{ {
bool isSel = _isSelected; bool isSel = _isSelected;
bool changed = MultiContainerWidget::updateSelection( tqparentSelected ); bool changed = MultiContainerWidget::updateSelection( parentSelected );
_maxSelectedHeight = 0; _maxSelectedHeight = 0;

@ -42,7 +42,7 @@ public:
virtual TQSize tqsizeHint() const; virtual TQSize tqsizeHint() const;
virtual RegExp* regExp() const; virtual RegExp* regExp() const;
virtual bool updateSelection(bool tqparentSelected); virtual bool updateSelection(bool parentSelected);
virtual bool isSelected() const; virtual bool isSelected() const;
virtual void applyRegExpToSelection( RegExpType type ); virtual void applyRegExpToSelection( RegExpType type );

@ -103,7 +103,7 @@ void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *chi
qFatal("Accepter not found in list"); qFatal("Accepter not found in list");
} }
bool MultiContainerWidget::updateSelection(bool tqparentSelected) bool MultiContainerWidget::updateSelection(bool parentSelected)
{ {
bool changed = false; bool changed = false;
bool isSel = _isSelected; bool isSel = _isSelected;
@ -114,7 +114,7 @@ bool MultiContainerWidget::updateSelection(bool tqparentSelected)
oldState[i] = _tqchildren.at(i)->isSelected(); oldState[i] = _tqchildren.at(i)->isSelected();
} }
RegExpWidget::updateSelection( tqparentSelected ); RegExpWidget::updateSelection( parentSelected );
int first; int first;
int last; int last;

@ -33,7 +33,7 @@ public:
virtual void clearSelection(); virtual void clearSelection();
virtual void deleteSelection(); virtual void deleteSelection();
virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child);
virtual bool updateSelection(bool tqparentSelected); virtual bool updateSelection(bool parentSelected);
virtual TQRect selectionRect() const; virtual TQRect selectionRect() const;
virtual RegExpWidget* widgetUnderPoint( TQPoint globalPos, bool justVisibleWidgets ); virtual RegExpWidget* widgetUnderPoint( TQPoint globalPos, bool justVisibleWidgets );
virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos ); virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos );

@ -56,9 +56,9 @@ void RegExpWidget::setConcChild(ConcWidget *)
qFatal("This widget should not expect any tqchildren"); qFatal("This widget should not expect any tqchildren");
} }
bool RegExpWidget::updateSelection(bool tqparentSelected) bool RegExpWidget::updateSelection(bool parentSelected)
{ {
bool selected = ( tqparentSelected || bool selected = ( parentSelected ||
_editorWindow->selectionOverlap( mapToGlobal( TQPoint(0,0) ), size() ) ) _editorWindow->selectionOverlap( mapToGlobal( TQPoint(0,0) ), size() ) )
&& !_isToplevel; && !_isToplevel;

@ -91,12 +91,12 @@ public:
/** /**
Update selection information for this widget. Update selection information for this widget.
@param tqparentSelected indicates whether the tqparent is selected. @param parentSelected indicates whether the tqparent is selected.
@return true if the selection state has changed for the widget since @return true if the selection state has changed for the widget since
the last time the widget was painted. `tqrepaint' is invoked on the widget if the last time the widget was painted. `tqrepaint' is invoked on the widget if
selection state is changed, to ensure that selection is visible. selection state is changed, to ensure that selection is visible.
*/ */
virtual bool updateSelection(bool tqparentSelected); virtual bool updateSelection(bool parentSelected);
/** /**
Clears the selection and repaints the widget if `update' is true. Clears the selection and repaints the widget if `update' is true.

@ -68,6 +68,6 @@ void SelectableLineEdit::slotKeyPressed()
if ( actualSize > size().width()-frameWidth ) { if ( actualSize > size().width()-frameWidth ) {
tqrepaint(); tqrepaint();
emit tqparentPleaseUpdate(); emit parentPleaseUpdate();
} }
} }

@ -45,7 +45,7 @@ protected slots:
void slotKeyPressed(); void slotKeyPressed();
signals: signals:
void tqparentPleaseUpdate(); void parentPleaseUpdate();
private: private:
RegExpWidget* _owner; RegExpWidget* _owner;

@ -28,9 +28,9 @@ SingleContainerWidget::SingleContainerWidget(RegExpEditorWindow* editorWindow,
{ {
} }
bool SingleContainerWidget::updateSelection( bool tqparentSelected ) bool SingleContainerWidget::updateSelection( bool parentSelected )
{ {
bool changed = RegExpWidget::updateSelection( tqparentSelected ); bool changed = RegExpWidget::updateSelection( parentSelected );
changed = _child->updateSelection( _isSelected ) && changed; changed = _child->updateSelection( _isSelected ) && changed;
if (changed) if (changed)
tqrepaint(); tqrepaint();

@ -31,7 +31,7 @@ public:
SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent,
const char* name = 0); const char* name = 0);
virtual bool updateSelection( bool tqparentSelected ); virtual bool updateSelection( bool parentSelected );
virtual bool hasSelection() const; virtual bool hasSelection() const;
virtual void clearSelection(); virtual void clearSelection();
virtual void deleteSelection(); virtual void deleteSelection();

@ -47,7 +47,7 @@ void TextWidget::init( const TQString& txt )
_edit->setText( txt ); _edit->setText( txt );
connect( _edit, TQT_SIGNAL( tqparentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) );
setFocusProxy( _edit ); setFocusProxy( _edit );
_edit->installEventFilter( this ); _edit->installEventFilter( this );
connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) ); connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) );
@ -81,9 +81,9 @@ void TextWidget::selectWidget( bool sel )
_edit->setSelected( sel ); _edit->setSelected( sel );
} }
bool TextWidget::updateSelection(bool tqparentSelected) bool TextWidget::updateSelection(bool parentSelected)
{ {
bool changed = RegExpWidget::updateSelection( tqparentSelected ); bool changed = RegExpWidget::updateSelection( parentSelected );
// I need to call this function all the time, else the rubber band will // I need to call this function all the time, else the rubber band will
// not be correctly deleted in the line edit. // not be correctly deleted in the line edit.

@ -46,7 +46,7 @@ public:
protected: protected:
void init( const TQString& text ); void init( const TQString& text );
virtual void paintEvent( TQPaintEvent *e ); virtual void paintEvent( TQPaintEvent *e );
virtual bool updateSelection( bool tqparentSelected ); virtual bool updateSelection( bool parentSelected );
virtual void clearSelection(); virtual void clearSelection();
virtual bool eventFilter( TQObject*, TQEvent* ); virtual bool eventFilter( TQObject*, TQEvent* );

@ -126,7 +126,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name)
return; return;
} }
TQWidget *frame = plugin.configPage()->tqparentWidget(); TQWidget *frame = plugin.configPage()->parentWidget();
// reparent the widget if the tqparent is not null // reparent the widget if the tqparent is not null
if (frame) { if (frame) {
plugin.configPage()->hide(); plugin.configPage()->hide();

@ -150,7 +150,7 @@ KSim::MainView::MainView(KConfig *config,
addPlugins(); addPlugins();
} }
connect(&m_tqmaskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
} }
KSim::MainView::~MainView() KSim::MainView::~MainView()
@ -160,7 +160,7 @@ KSim::MainView::~MainView()
void KSim::MainView::show() void KSim::MainView::show()
{ {
tqmaskMainView(); maskMainView();
TQWidget::show(); TQWidget::show();
} }
@ -207,10 +207,10 @@ const TQString &KSim::MainView::hostname() const
void KSim::MainView::slotMaskMainView() void KSim::MainView::slotMaskMainView()
{ {
tqmaskMainView(); maskMainView();
} }
void KSim::MainView::tqmaskMainView() void KSim::MainView::maskMainView()
{ {
if (!m_topFrame->background()->tqmask() || if (!m_topFrame->background()->tqmask() ||
!m_leftFrame->background()->tqmask() || !m_leftFrame->background()->tqmask() ||
@ -228,7 +228,7 @@ void KSim::MainView::tqmaskMainView()
TQSize insideSize(m_pluginLayout->tqgeometry().size()); TQSize insideSize(m_pluginLayout->tqgeometry().size());
// make a cleared bigrect where we can put our pixmap tqmasks on // make a cleared bigrect where we can put our pixmap masks on
TQBitmap bigBitmap(tqtopLevelWidget()->size(), true); TQBitmap bigBitmap(tqtopLevelWidget()->size(), true);
// better return if our bitmap is null so we can avoid crashes // better return if our bitmap is null so we can avoid crashes
@ -318,7 +318,7 @@ void KSim::MainView::reparseConfig(bool emitReload,
KSim::ThemeLoader::self().themeColours(this); KSim::ThemeLoader::self().themeColours(this);
m_sysinfo->createView(); m_sysinfo->createView();
tqmaskMainView(); maskMainView();
m_topLevel->reparse(); m_topLevel->reparse();
@ -404,7 +404,7 @@ void KSim::MainView::preferences()
void KSim::MainView::resizeEvent(TQResizeEvent *re) void KSim::MainView::resizeEvent(TQResizeEvent *re)
{ {
TQWidget::resizeEvent(re); TQWidget::resizeEvent(re);
m_tqmaskTimer.start(0, true); m_maskTimer.start(0, true);
} }
void KSim::MainView::paletteChange(const TQPalette &) void KSim::MainView::paletteChange(const TQPalette &)

@ -68,7 +68,7 @@ namespace KSim
k_dcop: k_dcop:
const TQString &hostname() const; const TQString &hostname() const;
virtual void tqmaskMainView(); virtual void maskMainView();
signals: signals:
void reload(); void reload();
@ -107,7 +107,7 @@ namespace KSim
TQBoxLayout *m_pluginLayout; TQBoxLayout *m_pluginLayout;
TQPoint m_mousePoint; TQPoint m_mousePoint;
int m_oldLocation; int m_oldLocation;
TQTimer m_tqmaskTimer; TQTimer m_maskTimer;
}; };
} }
#endif // KSIMVIEW_H #endif // KSIMVIEW_H

@ -91,7 +91,7 @@ void KSim::Label::configureObject(bool repaintWidget)
TQSize oldSize = tqsizeHint(); TQSize oldSize = tqsizeHint();
setConfigValues(); setConfigValues();
retqlayoutLabel(oldSize, repaintWidget); relayoutLabel(oldSize, repaintWidget);
} }
void KSim::Label::setPixmap(const TQPixmap &pixmap) void KSim::Label::setPixmap(const TQPixmap &pixmap)
@ -102,7 +102,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap)
TQSize oldSize = tqsizeHint(); TQSize oldSize = tqsizeHint();
d->sidePixmap = pixmap; d->sidePixmap = pixmap;
retqlayoutLabel(oldSize); relayoutLabel(oldSize);
} }
const TQPixmap &KSim::Label::pixmap() const const TQPixmap &KSim::Label::pixmap() const
@ -141,7 +141,7 @@ void KSim::Label::setText(const TQString &text)
TQSize oldSize = tqsizeHint(); TQSize oldSize = tqsizeHint();
// set the text of our widget and tqrepaint // set the text of our widget and tqrepaint
d->text = text; d->text = text;
retqlayoutLabel(oldSize); relayoutLabel(oldSize);
} }
void KSim::Label::extraTypeCall() void KSim::Label::extraTypeCall()
@ -273,10 +273,10 @@ void KSim::Label::setThemePixmap(const TQString &image)
d->meterImage.load(image); d->meterImage.load(image);
KSim::ThemeLoader::self().reColourImage(d->meterImage); KSim::ThemeLoader::self().reColourImage(d->meterImage);
d->background = d->meterImage.smoothScale(size()); d->background = d->meterImage.smoothScale(size());
retqlayoutLabel(oldSize); relayoutLabel(oldSize);
} }
void KSim::Label::retqlayoutLabel(const TQSize &old, bool tqrepaint) void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
{ {
if (tqsizeHint() != old) { if (tqsizeHint() != old) {
updateGeometry(); updateGeometry();

@ -196,7 +196,7 @@ namespace KSim
* sets the background image to be painted * sets the background image to be painted
*/ */
void setThemePixmap(const TQString &image); void setThemePixmap(const TQString &image);
void retqlayoutLabel(const TQSize &old, bool tqrepaint = true); void relayoutLabel(const TQSize &old, bool tqrepaint = true);
private: private:
/** /**

@ -228,7 +228,7 @@ void KSim::LedLabel::configureObject(bool reapaintWidget)
d->sendLed.update(); d->sendLed.update();
setConfigValues(); setConfigValues();
tqlayoutLeds(); layoutLeds();
if (reapaintWidget) if (reapaintWidget)
update(); update();
@ -313,10 +313,10 @@ void KSim::LedLabel::paintEvent(TQPaintEvent *ev)
void KSim::LedLabel::resizeEvent(TQResizeEvent *ev) void KSim::LedLabel::resizeEvent(TQResizeEvent *ev)
{ {
KSim::Progress::resizeEvent(ev); KSim::Progress::resizeEvent(ev);
tqlayoutLeds(); layoutLeds();
} }
void KSim::LedLabel::tqlayoutLeds() void KSim::LedLabel::layoutLeds()
{ {
int ledHeight = height() / 2; int ledHeight = height() / 2;

@ -184,7 +184,7 @@ namespace KSim
virtual void resizeEvent(TQResizeEvent *); virtual void resizeEvent(TQResizeEvent *);
private: private:
void tqlayoutLeds(); void layoutLeds();
void init(); void init();
class Private; class Private;

@ -163,12 +163,12 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev)
doCommand(); doCommand();
} }
KSim::PluginObject *KSim::PluginView::tqparentPlugin() const KSim::PluginObject *KSim::PluginView::parentPlugin() const
{ {
return d->tqparent; return d->tqparent;
} }
void KSim::PluginView::showAbout() void KSim::PluginView::showAbout()
{ {
tqparentPlugin()->showAbout(); parentPlugin()->showAbout();
} }

@ -145,7 +145,7 @@ namespace KSim
void pageChanged(); void pageChanged();
protected: protected:
PluginObject *tqparentPlugin() const; PluginObject *parentPlugin() const;
private: private:
class Private; class Private;
@ -194,7 +194,7 @@ namespace KSim
protected: protected:
virtual void mousePressEvent(TQMouseEvent *); virtual void mousePressEvent(TQMouseEvent *);
PluginObject *tqparentPlugin() const; PluginObject *parentPlugin() const;
private slots: private slots:
void showAbout(); void showAbout();

@ -188,7 +188,7 @@ void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap)
{ {
TQSize oldSize = tqsizeHint(); TQSize oldSize = tqsizeHint();
d->meterPixmap = pixmap; d->meterPixmap = pixmap;
retqlayoutLabel(oldSize); relayoutLabel(oldSize);
} }
int KSim::Progress::xLocation() const int KSim::Progress::xLocation() const

@ -158,8 +158,8 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
default: default:
break; break;
case Qt::LeftButton: case Qt::LeftButton:
if (tqparentWidget()->inherits("KSim::PluginView")) if (parentWidget()->inherits("KSim::PluginView"))
static_cast<KSim::PluginView *>(tqparentWidget())->doCommand(); static_cast<KSim::PluginView *>(parentWidget())->doCommand();
break; break;
} }

@ -253,7 +253,7 @@
<slot access="protected">applyFilter()</slot> <slot access="protected">applyFilter()</slot>
<slot access="protected">objectSelected(TQListViewItem *)</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -207,7 +207,7 @@
<tabstop>modifyMonitor</tabstop> <tabstop>modifyMonitor</tabstop>
<tabstop>removeMonitor</tabstop> <tabstop>removeMonitor</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -141,7 +141,7 @@ void HostDialog::init( const HostConfig &src )
{ {
// hide these, there's nothing to choose right now. might be that // hide these, there's nothing to choose right now. might be that
// net-snmp will support different privacy types in the future, but // net-snmp will support different privacy types in the future, but
// aptqparently not now. // apparently not now.
privacyTypeLabel->hide(); privacyTypeLabel->hide();
privacyType->hide(); privacyType->hide();

@ -514,7 +514,7 @@
<slot>checkValidity()</slot> <slot>checkValidity()</slot>
<slot access="protected">testHost()</slot> <slot access="protected">testHost()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -432,7 +432,7 @@
<slot access="protected">checkValues()</slot> <slot access="protected">checkValues()</slot>
<slot access="protected">browse()</slot> <slot access="protected">browse()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -117,7 +117,7 @@
<slot>accept()</slot> <slot>accept()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -269,7 +269,7 @@
<includes> <includes>
<include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in declaration">kseparator.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -147,7 +147,7 @@
<slot access="protected">accept()</slot> <slot access="protected">accept()</slot>
<slot access="protected">reject()</slot> <slot access="protected">reject()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
</includehints> </includehints>

@ -495,5 +495,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>_storeTogether_toggled(bool)</slot> <slot>_storeTogether_toggled(bool)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -411,6 +411,6 @@
<include location="global" impldecl="in implementation">kiconloader.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include>
</includes> </includes>
<pixmapfunction>SmallIconSet</pixmapfunction> <pixmapfunction>SmallIconSet</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -47,7 +47,7 @@ static PyObject* xcursor_position(self, args)
char* display_name; char* display_name;
int root_x_return, root_y_return; int root_x_return, root_y_return;
int win_x_return, win_y_return; int win_x_return, win_y_return;
unsigned int tqmask_return; unsigned int mask_return;
if (! (display_name = getenv("DISPLAY")) ) if (! (display_name = getenv("DISPLAY")) )
{ {
@ -83,7 +83,7 @@ static PyObject* xcursor_position(self, args)
XQueryPointer(display, root, &root_return, &child_return, XQueryPointer(display, root, &root_return, &child_return,
&root_x_return, &root_y_return, &root_x_return, &root_y_return,
&win_x_return, &win_y_return, &win_x_return, &win_y_return,
&tqmask_return); &mask_return);
/* return Python Object */ /* return Python Object */
return Py_BuildValue("(i,i)", root_x_return, root_y_return); return Py_BuildValue("(i,i)", root_x_return, root_y_return);

@ -446,7 +446,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
{ {
TQString tmpFile; TQString tmpFile;
#if defined(KDE_3_2) #if defined(KDE_3_2)
if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else #else
if(KIO::NetAccess::download(KURL(path), tmpFile)) if(KIO::NetAccess::download(KURL(path), tmpFile))
#endif #endif
@ -494,7 +494,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
{ {
TQString tmpFile; TQString tmpFile;
#if defined(KDE_3_2) #if defined(KDE_3_2)
if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else #else
if(KIO::NetAccess::download(KURL(path), tmpFile)) if(KIO::NetAccess::download(KURL(path), tmpFile))
#endif #endif

@ -71,7 +71,7 @@ class KarambaApplication : public KApplication
bool startThemes(TQStringList &lst); bool startThemes(TQStringList &lst);
KarambaIface* dcopIface() { return iface; }; KarambaIface* dcopIface() { return iface; };
dcopIface_stub* dcopStub() { return dcopIfaceStub; }; dcopIface_stub* dcopStub() { return dcopIfaceStub; };
TQWidget* tqparentWindow() { return (TQWidget*)themeListWindow; }; TQWidget* parentWindow() { return (TQWidget*)themeListWindow; };
void addKaramba(karamba* k, bool reloading = false); void addKaramba(karamba* k, bool reloading = false);
void deleteKaramba(karamba* k, bool reloading = false); void deleteKaramba(karamba* k, bool reloading = false);

@ -48,7 +48,7 @@ void RssSensor::update()
bool OK = false; bool OK = false;
#if defined(KDE_3_3) #if defined(KDE_3_3)
if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->tqparentWindow())) if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow()))
#else #else
if(KIO::NetAccess::download(KURL(source), tmpFile)) if(KIO::NetAccess::download(KURL(source), tmpFile))
#endif #endif

@ -62,7 +62,7 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
//Stupid stupid stupid work around for annoying bug //Stupid stupid stupid work around for annoying bug
//QXEmbed ignores setBackgroundOrigin(AncestorOrigin).... //QXEmbed ignores setBackgroundOrigin(AncestorOrigin)....
TQPixmap bug = TQPixmap(emb->size()); TQPixmap bug = TQPixmap(emb->size());
bitBlt(TQT_TQPAINTDEVICE(&bug), 0, 0, TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&pixmap)), emb->tqparentWidget()->x()+emb->x(), emb->tqparentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false); bitBlt(TQT_TQPAINTDEVICE(&bug), 0, 0, TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&pixmap)), emb->parentWidget()->x()+emb->x(), emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false);
emb->setPaletteBackgroundPixmap (bug); emb->setPaletteBackgroundPixmap (bug);
} }
@ -158,9 +158,9 @@ void Systemtray::updateTrayWindows( void )
else else
m_Wins.next(); m_Wins.next();
} }
tqlayoutSystray(); layoutSystray();
} }
void Systemtray::tqlayoutSystray() void Systemtray::layoutSystray()
{ {
int i = 0, a = 0; int i = 0, a = 0;
@ -213,7 +213,7 @@ void Systemtray::systemTrayWindowAdded( WId w )
emb->resize(24, 24); emb->resize(24, 24);
emb->show(); emb->show();
tqlayoutSystray(); layoutSystray();
} }
void Systemtray::systemTrayWindowRemoved(WId) void Systemtray::systemTrayWindowRemoved(WId)

@ -50,7 +50,7 @@ public slots:
int getTraySize(); int getTraySize();
void systemTrayWindowAdded( WId w ); void systemTrayWindowAdded( WId w );
void systemTrayWindowRemoved( WId w ); void systemTrayWindowRemoved( WId w );
void tqlayoutSystray(); void layoutSystray();
signals: signals:
void updated(); void updated();

@ -40,7 +40,7 @@ long moveSystray(long widget, long x, long y, long w, long h)
if (currTheme->systray != 0) { if (currTheme->systray != 0) {
currTheme->systray->move((int)x,(int)y); currTheme->systray->move((int)x,(int)y);
currTheme->systray->setMinimumSize((int)w,(int)h); currTheme->systray->setMinimumSize((int)w,(int)h);
currTheme->systray->tqlayoutSystray(); currTheme->systray->layoutSystray();
currTheme->systray->show(); currTheme->systray->show();
} }
return 1; return 1;
@ -161,7 +161,7 @@ long updateSystrayLayout(long widget)
if (currTheme->systray != 0) if (currTheme->systray != 0)
{ {
currTheme->systray->tqlayoutSystray(); currTheme->systray->layoutSystray();
} }
return 1; return 1;
} }

@ -95,7 +95,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayoutButtons</cstring> <cstring>layoutButtons</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -231,8 +231,8 @@
<slot access="protected">selectionChanged(int)</slot> <slot access="protected">selectionChanged(int)</slot>
<slot access="protected">search(const QString&amp;)</slot> <slot access="protected">search(const QString&amp;)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kwidgetlistbox.h</includehint> <includehint>kwidgetlistbox.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show)
void ThemeWidget::setDescriptionMaxHeight() void ThemeWidget::setDescriptionMaxHeight()
{ {
if(tqlayoutText->tqgeometry().height() <= 0) if(layoutText->tqgeometry().height() <= 0)
return; return;
int height = tqlayoutText->tqgeometry().height() - themeName->height() - int height = layoutText->tqgeometry().height() - themeName->height() -
tqlayoutText->spacing(); layoutText->spacing();
if(buttonGo->isVisible()) if(buttonGo->isVisible())
height -= tqlayoutButton->tqgeometry().height() + tqlayoutText->spacing(); height -= layoutButton->tqgeometry().height() + layoutText->spacing();
description->setMaximumHeight(height); description->setMaximumHeight(height);
} }

File diff suppressed because one or more lines are too long

@ -63,14 +63,14 @@ long createWidgetMask(long widget, char* path)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
TQBitmap bm; TQBitmap bm;
TQString tqmaskpath; TQString maskpath;
TQString rootPath; TQString rootPath;
rootPath.setAscii(currTheme->theme().path().ascii()); rootPath.setAscii(currTheme->theme().path().ascii());
currTheme->clearMask(); currTheme->clearMask();
tqmaskpath.setAscii(path); maskpath.setAscii(path);
rootPath.append(tqmaskpath.ascii()); rootPath.append(maskpath.ascii());
if(currTheme->theme().isZipTheme()) if(currTheme->theme().isZipTheme())
{ {

Loading…
Cancel
Save