diff options
107 files changed, 183 insertions, 183 deletions
diff --git a/ark/addition.ui b/ark/addition.ui index 8098325..ac12593 100644 --- a/ark/addition.ui +++ b/ark/addition.ui @@ -75,5 +75,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 62aa81e..ca6c24c 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -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 ) : KParts::ReadWritePart(tqparent, name) { kdDebug(1601)<<"ArkPart::ArkPart"<<endl; setInstance(ArkFactory::instance()); - awidget = new ArkWidget( tqparentWidget, "ArkWidget" ); + awidget = new ArkWidget( parentWidget, "ArkWidget" ); setWidget(awidget); connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) ); diff --git a/ark/ark_part.h b/ark/ark_part.h index 816ee6c..5cbd758 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -90,7 +90,7 @@ class ArkPart: public KParts::ReadWritePart Q_OBJECT TQ_OBJECT public: - ArkPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, + ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &, bool readWrite ); virtual ~ArkPart(); diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index d5dfba6..a511f63 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -38,7 +38,7 @@ ArkFactory::~ArkFactory() s_instance = 0L; } -KParts::Part * ArkFactory::createPartObject( TQWidget *tqparentWidget, +KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ) @@ -49,7 +49,7 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *tqparentWidget, { readWrite = true; } - ArkPart* obj = new ArkPart( tqparentWidget, widgetName, tqparent, name, + ArkPart* obj = new ArkPart( parentWidget, widgetName, tqparent, name, args, readWrite ); //kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl; return obj; diff --git a/ark/arkfactory.h b/ark/arkfactory.h index 57bc105..d9021b6 100644 --- a/ark/arkfactory.h +++ b/ark/arkfactory.h @@ -29,7 +29,7 @@ public: ArkFactory() : KParts::Factory() {} virtual ~ArkFactory(); 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, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); diff --git a/ark/extraction.ui b/ark/extraction.ui index a8b324a..b51ebee 100644 --- a/ark/extraction.ui +++ b/ark/extraction.ui @@ -75,5 +75,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 8036a28..82a0c21 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -513,8 +513,8 @@ FileLVI* FileListView::findParent( const TQString& fullname ) return static_cast< FileLVI* >( 0 ); // Get a list of ancestors - TQString tqparentFullname = name.left( name.tqfindRev( '/' ) ); - TQStringList ancestorList = TQStringList::split( '/', tqparentFullname ); + TQString parentFullname = name.left( name.tqfindRev( '/' ) ); + TQStringList ancestorList = TQStringList::split( '/', parentFullname ); // Checks if the listview contains the first item in the list of ancestors TQListViewItem *item = firstChild(); diff --git a/ark/general.ui b/ark/general.ui index f782d69..b02c214 100644 --- a/ark/general.ui +++ b/ark/general.ui @@ -89,5 +89,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcalc/colors.ui b/kcalc/colors.ui index e6b4513..6aae3bc 100644 --- a/kcalc/colors.ui +++ b/kcalc/colors.ui @@ -274,5 +274,5 @@ <tabstop>kcfg_MemoryButtonsColor</tabstop> <tabstop>kcfg_OperationButtonsColor</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcalc/constants.ui b/kcalc/constants.ui index 82fe7d2..efe888c 100644 --- a/kcalc/constants.ui +++ b/kcalc/constants.ui @@ -479,7 +479,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kcalc/general.ui b/kcalc/general.ui index 59ba2f3..3b922b8 100644 --- a/kcalc/general.ui +++ b/kcalc/general.ui @@ -195,5 +195,5 @@ <tabstop>kcfg_Beep</tabstop> <tabstop>kcfg_CaptionResult</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 7472f38..a10b98d 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -155,7 +155,7 @@ KCalculator::KCalculator(TQWidget *tqparent, const char *name) // 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); mLargePage = new TQWidget(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) // TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 4, 0, diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index e60a89f..c9a4559 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -1588,7 +1588,7 @@ <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui index df4576f..d94cfc2 100644 --- a/kdelirc/kcmlirc/editactionbase.ui +++ b/kdelirc/kcmlirc/editactionbase.ui @@ -1274,7 +1274,7 @@ <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui index a0f4b27..829a35d 100644 --- a/kdelirc/kcmlirc/editmodebase.ui +++ b/kdelirc/kcmlirc/editmodebase.ui @@ -293,7 +293,7 @@ <slot>slotCheckText(const QString &)</slot> <slot>slotClearIcon()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index eca2753..625b3a0 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -490,7 +490,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 90e91e8..5726eba 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -149,7 +149,7 @@ <Q_SLOTS> <slot>slotTextChanged( const TQString & newText )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index ad6867a..5e15af9 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -119,7 +119,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kedit/color.ui b/kedit/color.ui index 00f11c3..2310c57 100644 --- a/kedit/color.ui +++ b/kedit/color.ui @@ -122,7 +122,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kedit/misc.ui b/kedit/misc.ui index fa1ac30..76df775 100644 --- a/kedit/misc.ui +++ b/kedit/misc.ui @@ -119,5 +119,5 @@ <Q_SLOTS> <slot>settingsWrapMode( int mode )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/adduid.ui b/kgpg/adduid.ui index 0fbaa39..0bf4537 100644 --- a/kgpg/adduid.ui +++ b/kgpg/adduid.ui @@ -60,5 +60,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index 4034ba5..da86512 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -65,5 +65,5 @@ <Q_SLOTS> <slot>use_agent_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index 184acf9..7fa0563 100644 --- a/kgpg/conf_encryption.ui +++ b/kgpg/conf_encryption.ui @@ -313,7 +313,7 @@ <Q_SLOTS> <slot>allow_custom_option_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index d919ded..1109528 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -205,7 +205,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui index 5b8548d..8c0a43e 100644 --- a/kgpg/conf_misc.ui +++ b/kgpg/conf_misc.ui @@ -409,5 +409,5 @@ the original file.</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui index 075d782..a765cd9 100644 --- a/kgpg/conf_servers.ui +++ b/kgpg/conf_servers.ui @@ -110,7 +110,7 @@ all others will be stored for use by KGpg only.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui index 26e3d79..74a4a0b 100644 --- a/kgpg/conf_ui2.ui +++ b/kgpg/conf_ui2.ui @@ -168,7 +168,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui index 41e66fe..438d2b9 100644 --- a/kgpg/groupedit.ui +++ b/kgpg/groupedit.ui @@ -205,7 +205,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 6ac8100..8389aa3 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -135,7 +135,7 @@ <Q_SLOTS> <slot>checkFile_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui index 873b8ea..485c182 100644 --- a/kgpg/keyproperties.ui +++ b/kgpg/keyproperties.ui @@ -495,7 +495,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui index 097702d..40c81ec 100644 --- a/kgpg/keyserver.ui +++ b/kgpg/keyserver.ui @@ -332,5 +332,5 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index 2428d9c..2405494 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -145,7 +145,7 @@ <Q_SLOTS> <slot>cbSave_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index 67b2da9..b826975 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -397,7 +397,7 @@ Remember that if you download a file or open one in an editor, parts of the file <Q_SLOTS> <slot>finishButton_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index f52d821..4d2aa08 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -2052,24 +2052,24 @@ void listKeys::delsignkey() return; } - TQString signID,tqparentKey,signMail,tqparentMail; + TQString signID,parentKey,signMail,parentMail; ////////////////// 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); - 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)+")"; - if (tqparentKey==signID) { + if (parentKey==signID) { KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature.")); 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) return; 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))); } diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui index 8dfc354..fe978df 100644 --- a/kgpg/newkey.ui +++ b/kgpg/newkey.ui @@ -192,5 +192,5 @@ <Q_SLOTS> <slot>CBsave_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 01bd02b..1ae2a01 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -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.")); if (filemode) { - TQWidget *tqparentBox=new TQWidget(boutonboxoptions); - TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); + TQWidget *parentBox=new TQWidget(boutonboxoptions); + TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0); //shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setMargin(0); - CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); + CBshred=new TQCheckBox(i18n("Shred source file"),parentBox); TQWhatsThis::add (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>"); - 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(warn); } diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui index c58c6fe..a41947c 100644 --- a/kgpg/searchres.ui +++ b/kgpg/searchres.ui @@ -116,7 +116,7 @@ <tabstop>kLVsearch</tabstop> <tabstop>kLEID</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index 2881271..1d0b749 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -103,7 +103,7 @@ <Q_SLOTS> <slot>checkFile_toggled( bool isOn )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index 2b9dc96..7d823dc 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -323,7 +323,7 @@ int SFilterControl::execute( uchar *dest, uchar *src, uint size ) // A short description so that I will understand what the // 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 // two swap bits, eg 7-2 gives 10000100). Then the destination // is OR'ed with the swapped bitmap. diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index d1eaddd..e84d5ce 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -66,8 +66,8 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *tqparent, const char *name ) connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) ); connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) ); - connect( mHexView, TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ), - TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) ); + connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); @@ -398,7 +398,7 @@ void CHexEditorWidget::paletteChanged( void ) setColor( mDisplayState.color ); } -void CHexEditorWidget::tqlayoutChanged( const SDisplayLayout &/*tqlayout*/ ) +void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ ) { //mDisplayState.tqlayout = tqlayout; } @@ -1932,7 +1932,7 @@ void CHexEditorWidget::options( void ) connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(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 &)) ); connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)), TQT_SLOT(setFont(const SDisplayFont &)) ); diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index d14bfd1..7cd8cfa 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -170,7 +170,7 @@ class CHexEditorWidget : public TQWidget protected slots: void fontChanged( void ); void paletteChanged( void ); - void tqlayoutChanged( const SDisplayLayout &tqlayout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &input ); void setLineSize(const SDisplayLine &line ); void setLayout( const SDisplayLayout &tqlayout ); diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc index 2001a6b..bc7a4bc 100644 --- a/khexedit/hexmanagerwidget.cc +++ b/khexedit/hexmanagerwidget.cc @@ -297,7 +297,7 @@ void CTabBar::removeName( const TQString &name ) { mFileList.remove(it); removeTab(t); - tqlayoutTabs(); + layoutTabs(); break; } } @@ -323,7 +323,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName ) mFileList.remove(it); mFileList.append( CFileKey(newName,t->identifier()) ); - tqlayoutTabs(); + layoutTabs(); update(); // Seems to be necessary break; } diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index 8cdc1d4..2d99264 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -272,7 +272,7 @@ int CHexViewWidget::insertFile( TQFile &file, CProgress &p ) emit dataChanged(); emit cursorChanged( mHexBuffer->cursorState() ); - emit tqlayoutChanged( mLayout ); + emit layoutChanged( mLayout ); return( Err_Success ); } @@ -371,7 +371,7 @@ void CHexViewWidget::setBuffer( CHexBuffer *hexBuffer ) emit cursorChanged( mHexBuffer->cursorState() ); emit fileState( mHexBuffer->fileState() ); emit encodingChanged( mHexBuffer->encoding() ); - emit tqlayoutChanged( mLayout ); + emit layoutChanged( mLayout ); emit inputModeChanged( mHexBuffer->inputMode() ); emit fileName( mHexBuffer->url(), mHexBuffer->hasFileName() ); emit bookmarkChanged( mHexBuffer->bookmarkList() ); @@ -722,7 +722,7 @@ void CHexViewWidget::setLayout( SDisplayLayout &tqlayout ) mHexBuffer->setLayout( mLayout ); updateWindow(); - emit tqlayoutChanged( mLayout ); + emit layoutChanged( mLayout ); emit cursorChanged( mHexBuffer->cursorState() ); emit textWidth( defaultWidth() ); } diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index c467e03..65f1164 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -218,7 +218,7 @@ class CHexViewWidget : public TQFrame void cursorChanged( SCursorState &state ); void fileState( SFileState &state ); void dataChanged( void ); - void tqlayoutChanged( const SDisplayLayout &tqlayout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &mode ); void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void editMode( CHexBuffer::EEditMode editMode ); diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index 783a8c0..4669d9d 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -789,7 +789,7 @@ void COptionDialog::slotApply( void ) l.horzGridWidth = l.vertGridWidth = 1; } - emit tqlayoutChoice( mDisplayState.tqlayout ); + emit layoutChoice( mDisplayState.tqlayout ); } break; diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index 0089155..7a8f678 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase signals: void lineSizeChoice( const SDisplayLine &lineSize ); - void tqlayoutChoice( const SDisplayLayout &tqlayout ); + void layoutChoice( const SDisplayLayout &tqlayout ); void cursorChoice( const SDisplayCursor &cursor ); void colorChoice( const SDisplayColor &color ); void fontChoice( const SDisplayFont &font ); diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h index cc918a7..38aafd9 100644 --- a/khexedit/parts/kpart/khepartfactory.h +++ b/khexedit/parts/kpart/khepartfactory.h @@ -34,7 +34,7 @@ class KHexEditPartFactory : public KParts::Factory virtual ~KHexEditPartFactory(); public: - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index f23d9ad..4be3bda 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -83,8 +83,8 @@ KHexEdit::KHexEdit( void ) TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) ); connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) ); - connect( hexView(), TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) ); + connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); 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; diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index b15517c..398abf4 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -157,7 +157,7 @@ class KHexEdit : public KMainWindow void operationChanged( bool state ); void cursorChanged( SCursorState &state ); void fileState( SFileState &state ); - void tqlayoutChanged( const SDisplayLayout &tqlayout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &mode ); void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void removeRecentFile( const TQString &fileName ); diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 0f9e645..695ab5a 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -366,7 +366,7 @@ void KJotsMain::deleteEntry() return; } - KJotsBook* bk = cur->tqparentBook(); + KJotsBook* bk = cur->parentBook(); KJotsPage* nxt = dynamic_cast<KJotsPage*>(cur->nextSibling()); 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 //previous sibling, not just the entry directly above it. - if ( afterFirst && afterFirst->tqparent() != entry->tqparentBook() ) + if ( afterFirst && afterFirst->tqparent() != entry->parentBook() ) { TQListViewItemIterator it ( afterFirst ); afterFirst = 0; @@ -1090,13 +1090,13 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, while ( it.current() ) { //No other items were above this one. - if ( it.current() == entry->tqparentBook() ) + if ( it.current() == entry->parentBook() ) { break; } //Found a previous sibling! - if ( it.current()->tqparent() == entry->tqparentBook() ) + if ( it.current()->tqparent() == entry->parentBook() ) { afterFirst = it.current(); break; @@ -1126,7 +1126,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, { //We have to move item back. subjectList->takeItem(item); - entry->tqparentBook()->insertItem(item); + entry->parentBook()->insertItem(item); entry->moveItem(afterFirst); } else { subjectList->takeItem(item); @@ -1153,7 +1153,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, if ( entryAfter->isBook() ) entryAfter->setDirty(true); else - entryAfter->tqparentBook()->setDirty(true); + entryAfter->parentBook()->setDirty(true); } return; diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui index 85ff558..d057ae0 100644 --- a/kjots/confpagefont.ui +++ b/kjots/confpagefont.ui @@ -31,7 +31,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> </includehints> diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui index 390bfb3..4a45efb 100644 --- a/kjots/confpagemisc.ui +++ b/kjots/confpagemisc.ui @@ -145,7 +145,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index d15bf5c..34c1ca0 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -1052,10 +1052,10 @@ TQString KJotsPage::defaultSubject() { int page = 0; - if ( tqparentBook() ) + if ( parentBook() ) { //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 ) { if ( entry->isPage() ) ++page; @@ -1192,12 +1192,12 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode ) if ( top != this ) { - KJotsBook *tqparent = tqparentBook(); + KJotsBook *tqparent = parentBook(); while ( tqparent ) { html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject()); if ( tqparent == top ) break; - tqparent = tqparent->tqparentBook(); + tqparent = tqparent->parentBook(); } } html += TQString("</tr></table>"); diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index 2967eb3..b949886 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -74,7 +74,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem TQ_UINT64 id() { return m_id; } void setId(TQ_UINT64); - KJotsBook *tqparentBook() { return m_parent; } + KJotsBook *parentBook() { return m_parent; } void resetParent(); bool isBook() const { return m_isBook; } diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 32ed524..60540b0 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -708,7 +708,7 @@ quit: // and which has a transparent background. // Unfortunately this required the following twisted code because for some // 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 // the background by making it transparent with TQPixmap::setMask. This // involves the slow createHeuristicMask() function (from the API docs: diff --git a/klaptopdaemon/linux/cs.h b/klaptopdaemon/linux/cs.h index 69a38e0..93d159a 100644 --- a/klaptopdaemon/linux/cs.h +++ b/klaptopdaemon/linux/cs.h @@ -220,10 +220,10 @@ typedef struct irq_req_t { #define IRTQ_PULSE_ID 0x40 #define IRTQ_SHARE_ID 0x80 -typedef struct eventtqmask_t { +typedef struct eventmask_t { u_int Attributes; u_int EventMask; -} eventtqmask_t; +} eventmask_t; #define CONF_EVENT_MASK_VALID 0x01 diff --git a/klaptopdaemon/linux/k_compat.h b/klaptopdaemon/linux/k_compat.h index d18eaa5..e6d581b 100644 --- a/klaptopdaemon/linux/k_compat.h +++ b/klaptopdaemon/linux/k_compat.h @@ -124,11 +124,11 @@ #endif #if (LINUX_VERSION_CODE < VERSION(2,1,51)) -#define INVALIDATE_INODES(r) tqinvalidate_inodes(r) +#define INVALIDATE_INODES(r) invalidate_inodes(r) #else #define INVALIDATE_INODES(r) \ do { struct super_block *sb = get_super(r); \ - if (sb) tqinvalidate_inodes(sb); } while (0) + if (sb) invalidate_inodes(sb); } while (0) #endif #if (LINUX_VERSION_CODE < VERSION(2,1,60)) diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui index e77244f..c9ad68b 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui +++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui @@ -262,8 +262,8 @@ <Q_SLOTS> <slot>slotChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kled.h</includehint> diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui index 41ad25f..c987ed3 100644 --- a/kmilo/kmilod/defaultwidget.ui +++ b/kmilo/kmilod/defaultwidget.ui @@ -82,5 +82,5 @@ Released under the terms of the GNU GPL.</comment> </widget> </grid> </widget> -<tqlayoutdefaults spacing="2" margin="2"/> +<layoutdefaults spacing="2" margin="2"/> </UI> diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui index 3a25893..47d3874 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui @@ -290,8 +290,8 @@ <Q_SLOTS> <slot>slotChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index 31d7b5c..42d411b 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -44,7 +44,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to ) 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) ) return; @@ -79,7 +79,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre 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) ) return; diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index e55d5fe..3112416 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -280,17 +280,17 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) SingleContainerWidget::mouseReleaseEvent( event ); } -bool CompoundWidget::updateSelection( bool tqparentSelected ) +bool CompoundWidget::updateSelection( bool parentSelected ) { if ( _hidden ) { - bool changed = RegExpWidget::updateSelection( tqparentSelected ); + bool changed = RegExpWidget::updateSelection( parentSelected ); _child->selectWidget( _isSelected ); if (changed) tqrepaint(); return changed; } else { - return SingleContainerWidget::updateSelection( tqparentSelected ); + return SingleContainerWidget::updateSelection( parentSelected ); } } diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h index 6cea5b5..8a803a3 100644 --- a/kregexpeditor/compoundwidget.h +++ b/kregexpeditor/compoundwidget.h @@ -68,7 +68,7 @@ public: CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, TQWidget* tqparent, const char* name = 0); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return COMPOUND; } diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index fec2cc0..d70e735 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -229,10 +229,10 @@ RegExp* ConcWidget::regExp() const } } -bool ConcWidget::updateSelection(bool tqparentSelected) +bool ConcWidget::updateSelection(bool parentSelected) { bool isSel = _isSelected; - bool changed = MultiContainerWidget::updateSelection( tqparentSelected ); + bool changed = MultiContainerWidget::updateSelection( parentSelected ); _maxSelectedHeight = 0; diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index 073ff6e..49f6308 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -42,7 +42,7 @@ public: virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; - virtual bool updateSelection(bool tqparentSelected); + virtual bool updateSelection(bool parentSelected); virtual bool isSelected() const; virtual void applyRegExpToSelection( RegExpType type ); diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index e493b86..152f7a3 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -103,7 +103,7 @@ void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *chi qFatal("Accepter not found in list"); } -bool MultiContainerWidget::updateSelection(bool tqparentSelected) +bool MultiContainerWidget::updateSelection(bool parentSelected) { bool changed = false; bool isSel = _isSelected; @@ -114,7 +114,7 @@ bool MultiContainerWidget::updateSelection(bool tqparentSelected) oldState[i] = _tqchildren.at(i)->isSelected(); } - RegExpWidget::updateSelection( tqparentSelected ); + RegExpWidget::updateSelection( parentSelected ); int first; int last; diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 9cd9eaa..8194eb1 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -33,7 +33,7 @@ public: virtual void clearSelection(); virtual void deleteSelection(); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); - virtual bool updateSelection(bool tqparentSelected); + virtual bool updateSelection(bool parentSelected); virtual TQRect selectionRect() const; virtual RegExpWidget* widgetUnderPoint( TQPoint globalPos, bool justVisibleWidgets ); virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos ); diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index ec3c846..1e2ec6f 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -56,9 +56,9 @@ void RegExpWidget::setConcChild(ConcWidget *) 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() ) ) && !_isToplevel; diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 1774d40..0d65b8a 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -91,12 +91,12 @@ public: /** 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 the last time the widget was painted. `tqrepaint' is invoked on the widget if 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. diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index c9ed250..c0344e2 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -68,6 +68,6 @@ void SelectableLineEdit::slotKeyPressed() if ( actualSize > size().width()-frameWidth ) { tqrepaint(); - emit tqparentPleaseUpdate(); + emit parentPleaseUpdate(); } } diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index b50af86..068aabc 100644 --- a/kregexpeditor/selectablelineedit.h +++ b/kregexpeditor/selectablelineedit.h @@ -45,7 +45,7 @@ protected slots: void slotKeyPressed(); signals: - void tqparentPleaseUpdate(); + void parentPleaseUpdate(); private: RegExpWidget* _owner; diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index 2c2707c..dc9cdec 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -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; if (changed) tqrepaint(); diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h index 7a88a62..9b61ecf 100644 --- a/kregexpeditor/singlecontainerwidget.h +++ b/kregexpeditor/singlecontainerwidget.h @@ -31,7 +31,7 @@ public: SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, const char* name = 0); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual bool hasSelection() const; virtual void clearSelection(); virtual void deleteSelection(); diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 4f5045e..1095749 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -47,7 +47,7 @@ void TextWidget::init( const TQString& txt ) _edit->setText( txt ); - connect( _edit, TQT_SIGNAL( tqparentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); + connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); setFocusProxy( _edit ); _edit->installEventFilter( this ); connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) ); @@ -81,9 +81,9 @@ void TextWidget::selectWidget( bool 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 // not be correctly deleted in the line edit. diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index 973369c..1520808 100644 --- a/kregexpeditor/textwidget.h +++ b/kregexpeditor/textwidget.h @@ -46,7 +46,7 @@ public: protected: void init( const TQString& text ); virtual void paintEvent( TQPaintEvent *e ); - virtual bool updateSelection( bool tqparentSelected ); + virtual bool updateSelection( bool parentSelected ); virtual void clearSelection(); virtual bool eventFilter( TQObject*, TQEvent* ); diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 6d426c7..9115fea 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -126,7 +126,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) return; } - TQWidget *frame = plugin.configPage()->tqparentWidget(); + TQWidget *frame = plugin.configPage()->parentWidget(); // reparent the widget if the tqparent is not null if (frame) { plugin.configPage()->hide(); diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index b0b35b6..5624f54 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -150,7 +150,7 @@ KSim::MainView::MainView(KConfig *config, addPlugins(); } - connect(&m_tqmaskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); + connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); } KSim::MainView::~MainView() @@ -160,7 +160,7 @@ KSim::MainView::~MainView() void KSim::MainView::show() { - tqmaskMainView(); + maskMainView(); TQWidget::show(); } @@ -207,10 +207,10 @@ const TQString &KSim::MainView::hostname() const void KSim::MainView::slotMaskMainView() { - tqmaskMainView(); + maskMainView(); } -void KSim::MainView::tqmaskMainView() +void KSim::MainView::maskMainView() { if (!m_topFrame->background()->tqmask() || !m_leftFrame->background()->tqmask() || @@ -228,7 +228,7 @@ void KSim::MainView::tqmaskMainView() 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); // 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); m_sysinfo->createView(); - tqmaskMainView(); + maskMainView(); m_topLevel->reparse(); @@ -404,7 +404,7 @@ void KSim::MainView::preferences() void KSim::MainView::resizeEvent(TQResizeEvent *re) { TQWidget::resizeEvent(re); - m_tqmaskTimer.start(0, true); + m_maskTimer.start(0, true); } void KSim::MainView::paletteChange(const TQPalette &) diff --git a/ksim/ksimview.h b/ksim/ksimview.h index c6c158e..a1930f5 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -68,7 +68,7 @@ namespace KSim k_dcop: const TQString &hostname() const; - virtual void tqmaskMainView(); + virtual void maskMainView(); signals: void reload(); @@ -107,7 +107,7 @@ namespace KSim TQBoxLayout *m_pluginLayout; TQPoint m_mousePoint; int m_oldLocation; - TQTimer m_tqmaskTimer; + TQTimer m_maskTimer; }; } #endif // KSIMVIEW_H diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 1f32724..37b86b3 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -91,7 +91,7 @@ void KSim::Label::configureObject(bool repaintWidget) TQSize oldSize = tqsizeHint(); setConfigValues(); - retqlayoutLabel(oldSize, repaintWidget); + relayoutLabel(oldSize, repaintWidget); } void KSim::Label::setPixmap(const TQPixmap &pixmap) @@ -102,7 +102,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap) TQSize oldSize = tqsizeHint(); d->sidePixmap = pixmap; - retqlayoutLabel(oldSize); + relayoutLabel(oldSize); } const TQPixmap &KSim::Label::pixmap() const @@ -141,7 +141,7 @@ void KSim::Label::setText(const TQString &text) TQSize oldSize = tqsizeHint(); // set the text of our widget and tqrepaint d->text = text; - retqlayoutLabel(oldSize); + relayoutLabel(oldSize); } void KSim::Label::extraTypeCall() @@ -273,10 +273,10 @@ void KSim::Label::setThemePixmap(const TQString &image) d->meterImage.load(image); KSim::ThemeLoader::self().reColourImage(d->meterImage); 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) { updateGeometry(); diff --git a/ksim/library/label.h b/ksim/library/label.h index 484b36b..a888d89 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -196,7 +196,7 @@ namespace KSim * sets the background image to be painted */ void setThemePixmap(const TQString &image); - void retqlayoutLabel(const TQSize &old, bool tqrepaint = true); + void relayoutLabel(const TQSize &old, bool tqrepaint = true); private: /** diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp index 6977304..f2acc2b 100644 --- a/ksim/library/led.cpp +++ b/ksim/library/led.cpp @@ -228,7 +228,7 @@ void KSim::LedLabel::configureObject(bool reapaintWidget) d->sendLed.update(); setConfigValues(); - tqlayoutLeds(); + layoutLeds(); if (reapaintWidget) update(); @@ -313,10 +313,10 @@ void KSim::LedLabel::paintEvent(TQPaintEvent *ev) void KSim::LedLabel::resizeEvent(TQResizeEvent *ev) { KSim::Progress::resizeEvent(ev); - tqlayoutLeds(); + layoutLeds(); } -void KSim::LedLabel::tqlayoutLeds() +void KSim::LedLabel::layoutLeds() { int ledHeight = height() / 2; diff --git a/ksim/library/led.h b/ksim/library/led.h index 1d0cb4f..8ed0a14 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -184,7 +184,7 @@ namespace KSim virtual void resizeEvent(TQResizeEvent *); private: - void tqlayoutLeds(); + void layoutLeds(); void init(); class Private; diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7dff303..cfc57de 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -163,12 +163,12 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) doCommand(); } -KSim::PluginObject *KSim::PluginView::tqparentPlugin() const +KSim::PluginObject *KSim::PluginView::parentPlugin() const { return d->tqparent; } void KSim::PluginView::showAbout() { - tqparentPlugin()->showAbout(); + parentPlugin()->showAbout(); } diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index 39baef4..91285f4 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -145,7 +145,7 @@ namespace KSim void pageChanged(); protected: - PluginObject *tqparentPlugin() const; + PluginObject *parentPlugin() const; private: class Private; @@ -194,7 +194,7 @@ namespace KSim protected: virtual void mousePressEvent(TQMouseEvent *); - PluginObject *tqparentPlugin() const; + PluginObject *parentPlugin() const; private slots: void showAbout(); diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp index 32311e4..bbdbd61 100644 --- a/ksim/library/progress.cpp +++ b/ksim/library/progress.cpp @@ -188,7 +188,7 @@ void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap) { TQSize oldSize = tqsizeHint(); d->meterPixmap = pixmap; - retqlayoutLabel(oldSize); + relayoutLabel(oldSize); } int KSim::Progress::xLocation() const diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 5d20213..fb3b3ed 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -158,8 +158,8 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) default: break; case Qt::LeftButton: - if (tqparentWidget()->inherits("KSim::PluginView")) - static_cast<KSim::PluginView *>(tqparentWidget())->doCommand(); + if (parentWidget()->inherits("KSim::PluginView")) + static_cast<KSim::PluginView *>(parentWidget())->doCommand(); break; } diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index c3efab1..ed7d93d 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -253,7 +253,7 @@ <slot access="protected">applyFilter()</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 2d6134f..608dc8f 100644 --- a/ksim/monitors/snmp/configwidget.ui +++ b/ksim/monitors/snmp/configwidget.ui @@ -207,7 +207,7 @@ <tabstop>modifyMonitor</tabstop> <tabstop>removeMonitor</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp index b237bfe..e8eceab 100644 --- a/ksim/monitors/snmp/hostdialog.cpp +++ b/ksim/monitors/snmp/hostdialog.cpp @@ -141,7 +141,7 @@ void HostDialog::init( const HostConfig &src ) { // hide these, there's nothing to choose right now. might be that // net-snmp will support different privacy types in the future, but - // aptqparently not now. + // apparently not now. privacyTypeLabel->hide(); privacyType->hide(); diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index 935d013..d3da054 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -514,7 +514,7 @@ <slot>checkValidity()</slot> <slot access="protected">testHost()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klineedit.h</includehint> diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index bb6a059..5f9fb53 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -432,7 +432,7 @@ <slot access="protected">checkValues()</slot> <slot access="protected">browse()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index be32c72..c3df9bd 100644 --- a/ksim/monitors/snmp/proberesultdialogbase.ui +++ b/ksim/monitors/snmp/proberesultdialogbase.ui @@ -117,7 +117,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui index 1c938e0..766d39b 100644 --- a/ktimer/prefwidget.ui +++ b/ktimer/prefwidget.ui @@ -269,7 +269,7 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kwallet/kbetterthankdialogbase.ui b/kwallet/kbetterthankdialogbase.ui index 16d3514..0b421c7 100644 --- a/kwallet/kbetterthankdialogbase.ui +++ b/kwallet/kbetterthankdialogbase.ui @@ -147,7 +147,7 @@ <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui index 0d1d1e9..eaf5cf2 100644 --- a/kwallet/konfigurator/walletconfigwidget.ui +++ b/kwallet/konfigurator/walletconfigwidget.ui @@ -495,5 +495,5 @@ <Q_SLOTS> <slot>_storeTogether_toggled(bool)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui index 07bd5d0..dbe761e 100644 --- a/kwallet/walletwidget.ui +++ b/kwallet/walletwidget.ui @@ -411,6 +411,6 @@ <include location="global" impldecl="in implementation">kiconloader.h</include> </includes> <pixmapfunction>SmallIconSet</pixmapfunction> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/superkaramba/examples/globalMouse/extension/xcursor.c b/superkaramba/examples/globalMouse/extension/xcursor.c index 3de7ae3..8dad240 100644 --- a/superkaramba/examples/globalMouse/extension/xcursor.c +++ b/superkaramba/examples/globalMouse/extension/xcursor.c @@ -47,7 +47,7 @@ static PyObject* xcursor_position(self, args) char* display_name; int root_x_return, root_y_return; int win_x_return, win_y_return; - unsigned int tqmask_return; + unsigned int mask_return; if (! (display_name = getenv("DISPLAY")) ) { @@ -83,7 +83,7 @@ static PyObject* xcursor_position(self, args) XQueryPointer(display, root, &root_return, &child_return, &root_x_return, &root_y_return, &win_x_return, &win_y_return, - &tqmask_return); + &mask_return); /* return Python Object */ return Py_BuildValue("(i,i)", root_x_return, root_y_return); diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 9c5705c..5a28a11 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -446,7 +446,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) + if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) #else if(KIO::NetAccess::download(KURL(path), tmpFile)) #endif @@ -494,7 +494,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) + if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) #else if(KIO::NetAccess::download(KURL(path), tmpFile)) #endif diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h index 9d0f1bb..db47093 100644 --- a/superkaramba/src/karambaapp.h +++ b/superkaramba/src/karambaapp.h @@ -71,7 +71,7 @@ class KarambaApplication : public KApplication bool startThemes(TQStringList &lst); KarambaIface* dcopIface() { return iface; }; dcopIface_stub* dcopStub() { return dcopIfaceStub; }; - TQWidget* tqparentWindow() { return (TQWidget*)themeListWindow; }; + TQWidget* parentWindow() { return (TQWidget*)themeListWindow; }; void addKaramba(karamba* k, bool reloading = false); void deleteKaramba(karamba* k, bool reloading = false); diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp index 3640636..155ddd5 100644 --- a/superkaramba/src/rsssensor.cpp +++ b/superkaramba/src/rsssensor.cpp @@ -48,7 +48,7 @@ void RssSensor::update() bool OK = false; #if defined(KDE_3_3) - if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->tqparentWindow())) + if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow())) #else if(KIO::NetAccess::download(KURL(source), tmpFile)) #endif diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index 17c38b6..bf95a9c 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -62,7 +62,7 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) { //Stupid stupid stupid work around for annoying bug //QXEmbed ignores setBackgroundOrigin(AncestorOrigin).... 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); } @@ -158,9 +158,9 @@ void Systemtray::updateTrayWindows( void ) else m_Wins.next(); } - tqlayoutSystray(); + layoutSystray(); } -void Systemtray::tqlayoutSystray() +void Systemtray::layoutSystray() { int i = 0, a = 0; @@ -213,7 +213,7 @@ void Systemtray::systemTrayWindowAdded( WId w ) emb->resize(24, 24); emb->show(); - tqlayoutSystray(); + layoutSystray(); } void Systemtray::systemTrayWindowRemoved(WId) diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index 4411355..02870a8 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -50,7 +50,7 @@ public slots: int getTraySize(); void systemTrayWindowAdded( WId w ); void systemTrayWindowRemoved( WId w ); - void tqlayoutSystray(); + void layoutSystray(); signals: void updated(); diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index 1d2e53d..c953fdb 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -40,7 +40,7 @@ long moveSystray(long widget, long x, long y, long w, long h) if (currTheme->systray != 0) { currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); - currTheme->systray->tqlayoutSystray(); + currTheme->systray->layoutSystray(); currTheme->systray->show(); } return 1; @@ -161,7 +161,7 @@ long updateSystrayLayout(long widget) if (currTheme->systray != 0) { - currTheme->systray->tqlayoutSystray(); + currTheme->systray->layoutSystray(); } return 1; } diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui index daec764..b3ee3a1 100644 --- a/superkaramba/src/themes_layout.ui +++ b/superkaramba/src/themes_layout.ui @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayoutButtons</cstring> + <cstring>layoutButtons</cstring> </property> <hbox> <property name="name"> @@ -231,8 +231,8 @@ <slot access="protected">selectionChanged(int)</slot> <slot access="protected">search(const QString&)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kwidgetlistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index e286bc4..cd941b9 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show) void ThemeWidget::setDescriptionMaxHeight() { - if(tqlayoutText->tqgeometry().height() <= 0) + if(layoutText->tqgeometry().height() <= 0) return; - int height = tqlayoutText->tqgeometry().height() - themeName->height() - - tqlayoutText->spacing(); + int height = layoutText->tqgeometry().height() - themeName->height() - + layoutText->spacing(); if(buttonGo->isVisible()) - height -= tqlayoutButton->tqgeometry().height() + tqlayoutText->spacing(); + height -= layoutButton->tqgeometry().height() + layoutText->spacing(); description->setMaximumHeight(height); } diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui index 5ea381d..5ab1b70 100644 --- a/superkaramba/src/themewidget_layout.ui +++ b/superkaramba/src/themewidget_layout.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayoutIcon</cstring> + <cstring>layoutIcon</cstring> </property> <vbox> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayoutText</cstring> + <cstring>layoutText</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayoutButton</cstring> + <cstring>layoutButton</cstring> </property> <hbox> <property name="name"> @@ -174,8 +174,8 @@ <data format="PNG" length="5020">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000136349444154789ccd9b79701cd59dc73fdd3d3da76634b22559b66ccbb66c832f81011f9804dbc460ee04024b4ced5661b2542559425249259b4a422d816443b612925425454208098b03213e30068c39623026061bdf3696e54bb264dd1a5d73f774f7db3fbae7d0686449beb2bfaae77e6f34d3fdbedff7bbfaf79ee112486a2ddf32d7d32b36205efa16f30137205d8a679f4d8410c817f301fa3a569beb697028fc42f2058a0116cfe4274039e038eb6f5f26a8bdc4fed80b1cfcd1bd5401ce8b31c78b42406a2dcbf5756c53649e939cae2a662d81950f40692553cab9e5f1552c038a18420bf497099a26ef23b8429198f7d51b79e77feee76ac035d46fce552ee8cde22f335555f89522732700d58b60d61250652005d16e787b0d6dbd1c1eff2077038d4032f71e03c02f5a8d103ada872f90d289fced63bef4d0b3bc07c40171bef3bd60262036104cade5d76e95538acc9d8c9f032bbf0d353781eac49aab006f114c9a494590b9bf79885b003f395a3810fc9791a72d44a9be0af5ba7b90a1e88bd7f0d797becadd80970ba4bde7a501620341dde05b8acc23924431a53360d64d503a09d0725aca6aa60e89286c7d996858eb28ba9f65403d9048fd95a01069f00f214f5b88b5d009208e196a24ba690d4622c99e53fc60c5cff90d1001cc739efff96880be8ed542b0dfa1f0a8e42b2d66f1d7e0b3df80d26964563cbf09010e2754cdc6e7a6fcb5eff300103cfc14634566e5bf823c6d49963452808e3c760cde3bee06878bf993f8c9e647780408709e9a306a0d48ad65b92cf32b59a206d507b3ee86eacf6199b296732da001866eb5440cb66d408b6bd1ef3ecfbd4fdecfcf149979caa2af214f5b4ceeca5b57bb090d118bd0f7caeba43aba69ed65d3154ff020d007e8a3c52284183901b683fbb322733d00b35641f5cda03a86016f13207208307444d371cc831fa3a5883a247ccaa287ed958fe7b41cf024c14881ae21a2517a5e7d1badb397961e5ebffa49be0c748f9684119980d840505fc7f3b683bb9ec92b61e5f370f99740f590557133af9f3bce31012120a521a21184090e099f34e506e469d73350edb3ea0f3a08c3f221a681e45028b9e57adcd593a8f0737bed0ff9f0df1650cd39e40a432623690727048f2832c5945e05355f87e22aac954e16005e88883478fbbe674e601eda85d03484d38b88c7314e6c452a9b8e327dc160e0e9be69806137534772c80497cc43a40c8c632d33bef7395e8f697c61fd018e63a9dd88a47022b28ed5b2c42f258962bc9570f5e3503a2f0778aecae78e0b99810da8a311b1fb7dcc6818213b90a7cd46ae9c027bde23d11dc3481a38a62fc675fdbd0c527d53035d03dd320152a901fdf0e10642bb4e11d7687bb78e071fd9c87b392b34a414f401a9b52c77286c450d40cda330f9f63ca0f94d2b70cd697d2d70701b664733480ea8988c5c3915dc1e70a8b0771b0289785b1f465cc731e36a3ccbefc882279907dc26229543889e2272ac958e1d0da474221b0f71fff7b6f0778649988672828abe8e7ac51598c4ca6da0ba86216008f0b14ea8dd068d9f629a2005c7214d9c0a5ebf053cddf66f0749420848b48749764791c78cc37fd7bd482ec95afd0cd8c1c073c7d1d321da3e6a261937a3b5edfcf89e17f92d1065885c612827288eb7f228a97ea8fd15598796df8688f5a9181c7d1fb63e078d9f223c7ee4e957204dbd0c3c3e5094bce600878ae474e2995c865ae227d5d14edfba971189986df376336c5f60eab63f1838f655f898f8d909a8aaec9b5dca4f5fbc67f85c61a830e8e95bc3b6809705acdc02ded26156deee9fdc0ab5ef402a014e0f944f027fc9c015cf6f077780248124832c8324116fed2372a21da9c84ff0d6e53882fec2663084592442315a76f510ebd1a9efe67777fe95ef03fd8031120d00481e6fe5bf0138f8b3b3acbc3d6e3d006f3d01075fb3c25569254cba0c7cc5202b676fb606e050adbea2e2995c867fd624f4de305d6bb7906aefb2f3876c28cc8e8d6c84b0fbee2289aa6b8b70fb65aa027ce5ed553c0f945020ea0d458079cd77d8d21be55d5adf83aedd79a06de05db5b0fde7f0f13390e805ff18a8980a81b105547d889601ee0087dd1415f7a43282d74c47e8069debb7123d529f170a8d3c22069a85a2184cbe4ac534a1d4c31dd7543017f00d2220b596e5bd6b5801a87984685bf6f15d006aff3070e5631db0e769d8fe2474d581db076593a1b8cccaf5875bf5821a600147b1fb0e15776529a54be7220c41d7dff71139d298e7038c214831301206f53b358409af1ee38fbbdbc0c638c0ec1d0e85adc55e101b20aef1514ae74022c5c1a62edebbe63bd42d9bcb9f2ad8b79ad60fa07436d43e0f273759bf565de00b82cb6d0338cb4a0f458043cdf101f655b27c01b28c5aeaa4eca62be9da7e94cead874975575152337ef0eae78c8da4ce89ed0962bd828d753cf7f83f781de8c28aad03c2a2d4fa1c5fab08f2db827620e88f2638eaf7b010b5c8fa3015b156cde5039727c7a139cfeeec0a35c5094777679c5f067c86882c31a666d2f2ea6e12edfdf8ab4b19b77862c15068c4344e6c8b10eb31d3e05f034e61155ffac90989e93cc0f7d1937c73f14c7e8c1a84c52f40aa1dfaf643e747d0b567202baa7b2070e53c08903d70fc93b36a402e31a6a6d3b2690fd1862e8a2606a858548e221919f0f1ae048d3ba3c47a0c5ea9e3b927ce023e970019086cfe210facb8821fabee808fc54f43e95c200644a1ef309c78051ab7596aeb0b5a959e0180464980e202fc50bf63e06a6780cb0588b1aeadafeda5775f03ce6217539697a14806f1ae3827b6f6a127c588c0a709506c9bd0fef201472a4a38706555f276a56983135f19144f04e2e076c384b9106b83de26cbd63c45034257c6938fa8a920798022089fb1fd41da8738ac7eda412a4aded8817ff6248c844effd176c267e2385c50bfbd7f54e0011e7bec31943419406af31e1a2797b16f5e1577286d1f38f18d81e2f164decf275c06520ad17e12924970fb905cae8cd71e3101b2cb028f1fa20d03812ab9440c4d4cd1e513514bfc847635d0d390c4d4a13b4653733f47af9b406cf51c9caf9ea4966cf2529080fc4c50023c8fddc7c26fdec1b3c55eaaa95e093577dbe66011214eefc6dcf926020565f254a4a2c0e81c9f540414034168df52c0de076686854c43eb89d2be791fa18f8e234c102698f65598565048f77583a694419330e94dea1cbafd2d1e07924208a3502a2c019efbae63c6335f655dc0cb74262f84abef22b74a639e3a84fef17b0849419d713972a078e48e8f0056621684d0a651f90023a1d3f5fe61dadfd88b69826f6280aa9ba6e0f442b23b86d61d43e829fa1b6308dd20d2a913e93488f70984092983c88d5b58009c1142440a154404107ff91f1c753ab8eba9d5bc50dab8eb4ad0a066a9954a981af2c4a9a8cbbc24b7bd4db2b60e75da341c13270e13ff1d58bb62de6c53d4821ebf905684de3f4cfbe63de8510d57b99fca15d329aaf45a6130a5e10aa8b8bc1e482904ca65123d09e23d7a06fc893eb63f778c172ddbb3d2e2e16a824ea0fcd4d33c5355ca2d225086b2f44e2b6ed80f35439d243edc8ea9a570cd99833aa56a08d55741f6e5acbedd222f0eab01bdbb8ed1be79375a5718b5d84bf9b2cb1853332e3307eba528dbf46892964f7a68de1b251517b445a97bfe386b3637710868079a810e21447224455175fb13dc79ed4cd6992610188b7add8d1675f6c3cd5088d8ee7d18b104eeb97370cdbaac00016e9bf8205082de7286f8ee0d988933046ebe19c9ed1e940cc54eb4d2b1f91322c75a905d4ec67ee632c6dd707961e076bf635f17a7dee9241537896884d61ce7d9174fb00be804dab032c208a00b21c488aac2cdcf7053999fb72459c6d04cf097a0d65c85ecf5661e2ee231229f1c22d517c3396d0a454b97e4393e1f508c193688ef7e9764ddf6ccfd95b163295aba0ca5b40c2499544f84b60d1fd27fe014c284b14be751bef20a14074302ef3edc49fde626e23d1a118dd0fbcd6cfcd97ede024240ab4d4018eb1d5ec028cae29dcfb222e0e11d87cf8d3004c9fe24c82aee050b903deecc24443c4effbee3a4fa1338675613b87169c6f109cd49e2e03ee2bbdf29f80cc9e5c277e36d843ea8a577672da609c185f328bb7501ce31ae82a04969f41feba4e9ed7afa4ef691d489edede4dddf1ce2d586304d58eade01f4dac00b6682c34ac73316016ab008d9e9408fa64884a208d98177fe3c148f3333219188133ed141bc3d825a399ee0ddb7933cfc2989437b11c944c1fb0b13623d10ebb6de6b3cd5d594ddb214df8c0a200e2269e7fd59e0c98e3ecebc514bc7ae168409ad11eabebd83a74e873983a5ea1d408f7583a14b6267dda34f8b69c7586407389c388a9d783c2ea28dbd8477ecc333b30a576911e829244c0255018496227aba95f65fff0167c032ef4292ec8768c8c2e6089632e1ae2fe2af9949767324ed0c2540c288eb9cd97488d6bf5bf1df1b940977999ceee7e8e9300d581960bbfde361374a464400c22af408c501aaf54aada84e7c5355fa8f771239729ad4f8121c2e07aa5746910d8a27bac0300877e824bac15d62f9b6b4a4e210e9b0804b4e1fe3573d40f1c2456413aef46b8a051c49a2f9b503b4bd7d845444c33fcec1a4f92e840907374591ad72572f595b1f918c8880744665bdf9a5375f2414bf13ffe52ae1139dc49a7ab2df93241c2e19a75be00940a41b226d566931adeea918484e3f636fbc87314b6f43f6c85805dc34e82cf8aeed47695ebf93644718d5a750bdd44fd94c17007d67aca207028145c2a8768b4767028ac3deefcfb941c049c9554508c344eb89a1f52749866224fb12c47acd01696ab8ddb2716182525cc9d89b1ea268de221b7c6c10f8f0d1469ad6bc49b4a11d599599bc2448458d37edc3adc551cc4c0a7c2e32320d48e7d5e9f255aeef94ac7f24155ce3ddb82658d11e24b4de045a6f9c78479464778c4457dc224380d1d54ccb9ac7329397dd3e5c13aa10c2c03d713cb1d34df41f39893061c282122aaef0a338e50cf00c09b261cded1ccf8b8cd2041c59139032ffd8e3c15ece59eac45916a06886fd41d9e7c15489edfd1d08413c94c0489a180983586702113e4db8294adfa77556fcbfbc98098bc6e20ad8d314e9ba245902143db340e722a38c02ea201328ecdea51c6e72fe9e3c09c904deca6200bc95e965cb6e9e66fb69a0394b2b067f5fc8294b8b4602a4808c4a03b226401e7069c065d020ddcd94bfed7b14043a4a32949105b2a164f42630400386039ea71d99dabf7d702a175c2ef0416414d202bb7f290830856d02bac7ceebed3fe4fb81b4e4034f8f151514ddd6803c5b8673d3824ba901b1fa668acbc643516af0aa0fe2a1c0670e07188eb31090db1f21199782804f5b3830bf9223c6e986d9424804af5d044506280c033ccf0fa4eb7d691f7036702335894b41c0e77f4be8cb4bf8c2c34bf963d9a9facfea099d319f59825ce6c8dee1ac0ed01ecb794e1018bcaab9fd1168817c7e048cf48c9df9c71d9c9eff53563585d81c3bdd44fbe67730bb015db5de0f327b03f6fe80eab4f70ef2f60bd28e7444fb09cea1bf23bb40f342d27b490800eb7dbae3da5ff260730f6f243abb69d9f8267a4b0c34dbb3abb9c07340a43fcb0d8343821d8614c90909177abbcca98d751cf8fd3f00e84ad0c9594ae043c9b91c957500635e58c5c3d74ee65149755279d7adb8aaca61ac2befb6f9b9c278d0c260368d2cd9c95c84158afa4c880b5a3f6ee0d4e64f8987a2c474421f74b0f11747d808d4014d58a5eb6165540725f3c40114bfb88affb87a023f92542793eebe1df794f150e6cf039d7b2d07a317c4993cb085faf6d810d09f8288414f5d07475ed8453c14453789ede862d313077905eb90648bdd86dc09ca97f32100ec3dc517efe3eb73cbf94f057c13562c23387f2e549659657060a01694029d205ab20087d20243405f02fa347a8eb6736af3117a8e77a09bc4f6f7f0eeef8ef1eae9282d58d59f76ace3b20946f13a7cbe04804dc2f7af67c5bfcce1cf32f826aef81c2557d540e5f89cac31fd98127bbe6d30e0a80dd9be61424f0c7a62243a23d4addf4fe7c166004e84d9f1a713acdd15e218d97a5fbaec35e0fccf48e44210001609bec79672c31d33f98b22f095cebf92ca1b96c39469d679c0cc63025805daf6f4141840426f183afbd0fbe31c7b652f2d3beb01e84850b7e6146bde6cc9d4f5dbb0d43ec6391c924ecb852200ecedb4af5ccdc2fb67f1accf41f598d9739872eb6d30712a148fb1bfe2c5da930831007c4f2fb487d0fba2346e3f4ae30775e8718d3e8da6f58dfce5a5063ea1405d9f737f09042e2c01609370d35466fc6031eb3c0ad383d53398b6f25694993530763cd67ff969c6d25a01a12e686b034da375f749ea5efb043daee57af62d5880d3c007d4f5cf572e34016091e0bc751a33be319f178a55aef4948e63f67dff8a63ea1ca89c053441b8099a9b2012a6f34803c75edf49bc2792efe09ac896b7fb2850d73f5fb91804a4c50994afbf8d672a3cdce22dade0f2bbeec33d6536e82d106ea5a7a185faad7be83ed50ac0a7bdbcf3542d7f6b8cd2cc6007774181a7e5621200d63ef2d8f537f36cb99bdb64d54dcdaa0771b8921c7f7b2b1db5f50813cec4d8f7741dffbb2bc449b20e2e0dfc9c1ddc48e462130076d6f8fc727e52e5e3df15d58d164f204c688f51f77a331b5eaacf6c5cb66279c7281719785a2e0501609110fce5221eae29e1bfa21a5d6f34f1d2ef8fb30d0b783b590797e20239b891c8a52200acca41e0de292c5cdb808195b474d82dedd92f8a9d9f4d2e250160254c5eacd35106562c4ff24f009e1671ae9b09e721b97b5eff74114220fd3358f8ff24ff07d25c4baf04fdecaa0000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index bfc4b27..ad545f3 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -63,14 +63,14 @@ long createWidgetMask(long widget, char* path) { karamba* currTheme = (karamba*)widget; TQBitmap bm; - TQString tqmaskpath; + TQString maskpath; TQString rootPath; rootPath.setAscii(currTheme->theme().path().ascii()); currTheme->clearMask(); - tqmaskpath.setAscii(path); - rootPath.append(tqmaskpath.ascii()); + maskpath.setAscii(path); + rootPath.append(maskpath.ascii()); if(currTheme->theme().isZipTheme()) { |