diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:51:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:51:43 -0600 |
| commit | 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 (patch) | |
| tree | c57406ac640b2ce83ebc0ec0cbc96d0e3e40d9b5 /quanta | |
| parent | ff23fbd0f4265648d9a1d53f4230c3f7c78c4f77 (diff) | |
| download | tdewebdev-2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.tar.gz tdewebdev-2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'quanta')
191 files changed, 1012 insertions, 1012 deletions
diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno index eb2837b7..fc22ca65 100644 --- a/quanta/Quanta-3.3-plan.kno +++ b/quanta/Quanta-3.3-plan.kno @@ -22,24 +22,24 @@ \NewEntry 1 Toolbars <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick "add this tag to a toolbar" RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, tqlayout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static tqlayout the tqlayout and presentation become dynamic. This will require balance and good icons to be more productive.</p> +<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick "add this tag to a toolbar" RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, layout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static layout the layout and presentation become dynamic. This will require balance and good icons to be more productive.</p> </body></html> \NewEntry 2 Phase 2 explanation <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <p><span style="font-style:italic;color:#3300ff">> - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.</span></p> <p>Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.</p> -<p>In balancing these several concepts seem to offer counterpoints.<br />familiar tqlayout <-> specifically applicable actions<br />pre-made toolbars <-> dynamicly created toolbars<br />feature oriented toolbars <-> task oriented toolbars</p> +<p>In balancing these several concepts seem to offer counterpoints.<br />familiar layout <-> specifically applicable actions<br />pre-made toolbars <-> dynamicly created toolbars<br />feature oriented toolbars <-> task oriented toolbars</p> <p>Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:</p> -<p>1) orient correctly to every task<br />2) retain familiarity of tqlayout for variations and segue to next task<br />3) offer only proper tag relationships</p> -<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard tqlayout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p> +<p>1) orient correctly to every task<br />2) retain familiarity of layout for variations and segue to next task<br />3) offer only proper tag relationships</p> +<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard layout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p> <p>So we can say this about the ultimate solution:</p> <p>1) I don't think anybody is really anal enough to already be doing it.</p> <p>2) If it could be accomplished it would be very very cool and get a lot of press.</p> <p>3) It cannot be a single solution, thus it's multiple "personalities"</p> -<p>4) Basic structure and tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p> +<p>4) Basic structure and layout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p> <p>5) No single solution is possible so it must allow for easy user extensibility</p> -<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar tqlayout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p> +<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar layout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p> <p>My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)</p> <p></p> </body></html> @@ -56,7 +56,7 @@ \NewEntry 1 VPL <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the tqlayout or CSS visually in data tqlayout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p> +<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the layout or CSS visually in data layout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p> </body></html> \NewEntry 0 New Features @@ -94,7 +94,7 @@ \NewEntry 1 RAD Site <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or tqlayout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical tqlayout<br />- conceptual group<br />- style grouping<br />- tqlayout grouping<br />Level views would include<br />- overview<br />- concept/style/tqlayout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p> +<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or layout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical layout<br />- conceptual group<br />- style grouping<br />- layout grouping<br />Level views would include<br />- overview<br />- concept/style/layout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p> </body></html> \NewEntry 0 Plug Ins diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 1e2a1b8b..7538ebe9 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -56,7 +56,7 @@ void colorRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 58e67d0f..411f056c 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -37,9 +37,9 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, TQLabel *leftLabel = new TQLabel("<b>" + l +"</b>",leftBox); TQLabel *centerLabel = new TQLabel(("<b>" + c +"</b>"),centerBox); TQLabel *rightLabel = new TQLabel(("<b>" + r +"</b>"),rightBox); - leftLabel->tqsetAlignment(TQt::AlignHCenter); - centerLabel->tqsetAlignment(TQt::AlignHCenter); - rightLabel->tqsetAlignment(TQt::AlignHCenter); + leftLabel->setAlignment(TQt::AlignHCenter); + centerLabel->setAlignment(TQt::AlignHCenter); + rightLabel->setAlignment(TQt::AlignHCenter); leftLabel->setTextFormat (TQt::RichText ) ; centerLabel->setTextFormat ( TQt::RichText ) ; rightLabel->setTextFormat (TQt::RichText ) ; diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index e548d7d9..7f65e9c7 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -16,12 +16,12 @@ ***************************************************************************/ #include "csseditor.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqpushbutton.h> #include <tqcheckbox.h> -#include <tqtextedit.h> -#include <tqtextstream.h> +#include <textedit.h> +#include <textstream.h> #include <tqfileinfo.h> #include <kapplication.h> diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui index d1fe0993..2661d75d 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>280</width> <height>20</height> @@ -41,7 +41,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -117,13 +117,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>33</width> <height>7</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>290</width> <height>32767</height> @@ -338,7 +338,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -363,7 +363,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32766</width> <height>32766</height> diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 7e61cf02..cdf9db04 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -21,7 +21,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqpushbutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtabwidget.h> #include <tqobjectlist.h> #include <tqfileinfo.h> diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index dd899b1b..cb4ed81b 100644 --- a/quanta/components/csseditor/cssselectors.ui +++ b/quanta/components/csseditor/cssselectors.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -70,7 +70,7 @@ </spacer> <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -329,7 +329,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -412,7 +412,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -478,7 +478,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -521,7 +521,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -597,7 +597,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -606,7 +606,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -622,7 +622,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -672,7 +672,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -791,7 +791,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -800,7 +800,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -866,7 +866,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -917,7 +917,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -939,7 +939,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>380</width> <height>20</height> diff --git a/quanta/components/csseditor/data/config.xml b/quanta/components/csseditor/data/config.xml index 988041ca..15fd659f 100644 --- a/quanta/components/csseditor/data/config.xml +++ b/quanta/components/csseditor/data/config.xml @@ -469,9 +469,9 @@ <freeedit/> </right> - <table-tqlayout> + <table-layout> <list value="auto,fixed,inherit"/> - </table-tqlayout> + </table-layout> <text-align> <list value="center,justify,right,left,inherit"/> @@ -503,9 +503,9 @@ <freeedit/> </top> - <tqunicode-bidi> + <unicode-bidi> <list value="normal,embed,bidi-override,inherit"/> - </tqunicode-bidi> + </unicode-bidi> <vertical-align> <list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/> diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..4aef2399 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -20,7 +20,7 @@ #include "encodingselector.h" #include <kglobal.h> #include <kcharsets.h> -#include <tqtextcodec.h> +#include <textcodec.h> /** *@author gulmini luciano diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui index 6ac64343..178eacc4 100644 --- a/quanta/components/csseditor/encodingselectors.ui +++ b/quanta/components/csseditor/encodingselectors.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 273c5a4c..bd9e59ef 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -36,14 +36,14 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); - lePreview->tqsetAlignment(TQt::AlignCenter); + lePreview->setAlignment(TQt::AlignCenter); TQFont font; font.setPointSize(20); lePreview->setFont(font); lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { if( (*it).contains('[') !=0 ) it = families.remove(it); @@ -52,20 +52,20 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF if( families.count() != 0 ) lbAvailable->insertStringList(families); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); pbAdd->setIconSet(iconSet); pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("back")); + iconSet = SmallIconSet(TQString::fromLatin1("back")); pbRemove->setIconSet(iconSet); pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("up")); + iconSet = SmallIconSet(TQString::fromLatin1("up")); pbMoveUp->setIconSet(iconSet); pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("down")); + iconSet = SmallIconSet(TQString::fromLatin1("down")); pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 86a109d9..7675741a 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <vbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <vbox> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <vbox> <property name="name"> @@ -64,7 +64,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <vbox> <property name="name"> @@ -87,7 +87,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -145,7 +145,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout38</cstring> + <cstring>layout38</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -193,7 +193,7 @@ <property name="title"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="flat"> @@ -219,13 +219,13 @@ <property name="name"> <cstring>pbMoveUp</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -239,13 +239,13 @@ <property name="name"> <cstring>pbAdd</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -259,13 +259,13 @@ <property name="name"> <cstring>pbRemove</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -279,13 +279,13 @@ <property name="name"> <cstring>pbMoveDown</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -318,7 +318,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -358,7 +358,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>313</width> <height>20</height> @@ -383,7 +383,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index f1e1c101..922c7dbe 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -113,7 +113,7 @@ void propertySetter::addButton(){ m_pb = new KPushButton(this); TQToolTip::add(m_pb, i18n( "More..." )); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index b94bdbcd..c62cc7a7 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -42,7 +42,7 @@ StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_iconWidth = pixMap.width(); diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index 0a573925..0b80caa2 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -164,11 +164,11 @@ void stylesheetParser::parseSelector(){ if (m_stylesheetStructure.contains(selectorName)) { uint i = 2; - TQString s = selectorName + TQString("-v%1").tqarg(i); + TQString s = selectorName + TQString("-v%1").arg(i); while (m_stylesheetStructure.contains(s)) { i++; - s = selectorName + TQString("-v%1").tqarg(i); + s = selectorName + TQString("-v%1").arg(i); } selectorName = s; } diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 7a35ee23..994876a3 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){ } void TLPEditor::setButtonIcon(TQString s){ - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1(s.ascii())); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii())); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index 3eb19d7a..5f43c131 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 930ebeec..9b409b34 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -17,8 +17,8 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqradiobutton.h> -#include <tqtextedit.h> -#include <tqtextstream.h> +#include <textedit.h> +#include <textstream.h> #include <tqtimer.h> //kde includes @@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files) if (m_updateToDlg->tagRadioButton->isChecked()) { extraOpts = "-r " + m_updateToDlg->tagCombo->currentText(); - commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText()); + commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText()); } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); @@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore() line = str.readLine().stripWhiteSpace(); if (line == fInfo.fileName()) { - emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); found = true; break; } @@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore() if (!found) { str << fInfo.fileName() << endl; - emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore() } if (!found) { - emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore() TQTextStream str(&f); str.setEncoding(TQTextStream::UnicodeUTF8); str << content; - emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); f.close(); } @@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus) { if (!normalExit) { - KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed")); + KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed")); } if (exitStatus == 0) { @@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output) void CVSService::notInRepository() { emit clearMessages(); - emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false); + emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false); } void CVSService::startService() diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index 4b85c5d2..d4d2dc7b 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index dd94f4ae..fcd4b1db 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -163,13 +163,13 @@ <property name="name"> <cstring>ledWarning</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -215,7 +215,7 @@ <property name="text"> <string>File:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -234,7 +234,7 @@ <property name="text"> <string>Objects of class:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -253,7 +253,7 @@ <property name="text"> <string>Function:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 584e71f0..a087ae03 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").tqarg(service), true); + emit networkError(i18n("Listening on port %1").arg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); + emit networkError(i18n("Unable to listen on port %1").arg(service), true); } } } @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index b8ab40bd..10888885 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -496,7 +496,7 @@ <property name="text"> <string>Break on:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -605,7 +605,7 @@ <property name="text"> <string>Default mode:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 578fedb9..7c76066b 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -47,7 +47,7 @@ TQString TQByteArrayFifo::retrieve( ) bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.tqresize(m_size + size )) + if(!m_array.resize(m_size + size )) return false; // Copy the elements diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 4ee2bceb..3fe2f972 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -57,7 +57,7 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS m_supportsasync = false; m_defaultExecutionState = Starting; setExecutionState(m_defaultExecutionState); - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); @@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active) setExecutionState(m_defaultExecutionState); if(active) - emit updatetqStatus(DebuggerUI::AwaitingConnection); + emit updateStatus(DebuggerUI::AwaitingConnection); else - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); } @@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) debuggerInterface()->setActiveLine("", 0); if(connected) - emit updatetqStatus(DebuggerUI::Connected); + emit updateStatus(DebuggerUI::Connected); else { setExecutionState(m_defaultExecutionState); - emit updatetqStatus(DebuggerUI::AwaitingConnection); + emit updateStatus(DebuggerUI::AwaitingConnection); profilerOpen(false); } @@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log) { - debuggerInterface()->showtqStatus(errormsg, log); + debuggerInterface()->showStatus(errormsg, log); } @@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state) if(state == "starting") { setExecutionState(Starting); - emit updatetqStatus(DebuggerUI::Paused); + emit updateStatus(DebuggerUI::Paused); } else if(state == "stopping") { setExecutionState(Stopping); - emit updatetqStatus(DebuggerUI::Paused); + emit updateStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "stopped") { setExecutionState(Stopped); - emit updatetqStatus(DebuggerUI::Paused); + emit updateStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "running") { setExecutionState(Running); - emit updatetqStatus(DebuggerUI::Running); + emit updateStatus(DebuggerUI::Running); } else if(state == "break") { setExecutionState(Break); - emit updatetqStatus(DebuggerUI::Paused); + emit updateStatus(DebuggerUI::Paused); } } @@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) TQDomNode response = data.elementsByTagName("response").item(0); TQString command = attribute(response, "command"); - // tqStatus command + // Status command if(command == "status") setExecutionState(attribute(response, "status")); @@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) } else { - debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true); + debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true); kdDebug(24002) << datas << endl; } @@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket) { if(attribute(initpacket, "protocol_version") != protocolversion) { - debuggerInterface()->showtqStatus( + debuggerInterface()->showStatus( i18n("The debugger for %1 uses an unsupported protocol version (%2)") - .tqarg(attribute(initpacket, "language")) - .tqarg(attribute(initpacket, "protocol_version")) + .arg(attribute(initpacket, "language")) + .arg(attribute(initpacket, "protocol_version")) , true); endSession(); @@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint) " -n " + TQString::number(breakpoint->line() + 1) , breakpoint->condition()); - breakpoint->setKey(TQString("id %1").tqarg(id)); + breakpoint->setKey(TQString("id %1").arg(id)); } void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) @@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) id = attribute(response, "transaction_id").toLong(); if(id > 0) { - TQString oldkey = TQString("id %1").tqarg(id); + TQString oldkey = TQString("id %1").arg(id); DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey); if(bp) debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id")); @@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen) else { if(forceopen) - KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error")); + KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error")); else - debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false); + debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false); } } else @@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode) { if(attribute(setnode, "success") == "0") { - debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true); + debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true); } } @@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen { /* Sample: - <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" tqchildren="1" numtqchildren="4"> + <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4"> <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int"> <![CDATA[1949]]> </property> - <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3"> + <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3"> <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64"> <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]> </property> @@ -1021,16 +1021,16 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) } else { - emit updatetqStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); + emit updateStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); } break; } else { // Fatal error - emit updatetqStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); + emit updateStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); } } errornode = errornode.nextSibling(); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 8e5b667f..668fbe30 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -161,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient void processCommand(const TQString&); signals: - void updatetqStatus(DebuggerUI::DebuggertqStatus); + void updateStatus(DebuggerUI::DebuggerStatus); }; #endif diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index 0e65ee5c..fa8f9719 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); + disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = NULL; @@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!m_client) { emit hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } break; } @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); + connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); + disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = 0L; @@ -605,7 +605,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line ) quantaApp->gotoFileAndLine(filename, line, 0); else { - showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true); + showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true); } // Add new active line mark @@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) } // Show a status message and optionally put it on the log -bool DebuggerManager::showtqStatus(const TQString& a_message, bool log) +bool DebuggerManager::showStatus(const TQString& a_message, bool log) { TQString message = a_message; quantaApp->slotStatusMsg(m_client->getName() + ": " + message); diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 8fae5864..de032937 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -71,7 +71,7 @@ class DebuggerManager : public TQObject void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey); // Public help functions - bool showtqStatus(const TQString& message, bool log); + bool showStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line); void setMark(const TQString& filename, long line, bool set, int mark); diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index d2f710b6..fdf32a5c 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -109,7 +109,7 @@ void DebuggerUI::showMenu() else m_debuggerMenuID = 0; - // tqStatus indicator + // Status indicator quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER); } @@ -124,7 +124,7 @@ void DebuggerUI::hideMenu() } m_debuggerMenuID = 0; - // tqStatus indicator + // Status indicator quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER); } @@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url) m_preview->openURL(url); } -void DebuggerUI::slottqStatus( DebuggertqStatus status ) +void DebuggerUI::slotStatus( DebuggerStatus status ) { switch(status) { diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index de939315..c7e7d145 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -38,7 +38,7 @@ class DebuggerUI : public TQObject TQ_OBJECT public: - enum DebuggertqStatus + enum DebuggerStatus { NoSession = 0, AwaitingConnection, @@ -83,8 +83,8 @@ class DebuggerUI : public TQObject WHTMLPart *m_preview; public slots: - // tqStatus indication - void slottqStatus(DebuggerUI::DebuggertqStatus status); + // Status indication + void slotStatus(DebuggerUI::DebuggerStatus status); }; diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp index 46f827cb..390290a7 100644 --- a/quanta/components/debugger/debuggervariable.cpp +++ b/quanta/components/debugger/debuggervariable.cpp @@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver return NULL; } -void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren ) +void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren ) { m_name = v->name(); - m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count()); + m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count()); m_value = v->value(); m_type = v->type(); m_isReference = v->isReference(); // We cant just assign m_valuelist to v->values(), it would make a shallow copy... // - if(copytqchildren) + if(copychildren) { m_valueList.clear(); for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next()) diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index 09a3873c..f8d674d5 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -125,7 +125,7 @@ <property name="text"> <string>New value:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index ccca567c..c9caa54c 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -407,7 +407,7 @@ <property name="text"> <string>Break on:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>50</height> @@ -530,7 +530,7 @@ <property name="name"> <cstring>sliderDisplayDelay</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>27</height> @@ -566,7 +566,7 @@ <property name="text"> <string>Slow</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -606,7 +606,7 @@ <property name="text"> <string>Default mode:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -617,7 +617,7 @@ <property name="text"> <string>Run speed:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -670,7 +670,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index d083739a..3edcd527 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -57,7 +57,7 @@ QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, co m_defaultExecutionState = Pause; setExecutionState(m_defaultExecutionState); - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); m_datalen = -1; } @@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed () delete m_server; m_server = NULL; } - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); } // Try to make a connection to the gubed server @@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession() debuggerInterface()->enableAction("debug_request", false); kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl; - emit updatetqStatus(DebuggerUI::AwaitingConnection); + emit updateStatus(DebuggerUI::AwaitingConnection); } } else @@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession() if(m_server->listen()) { - emit updatetqStatus(DebuggerUI::AwaitingConnection); + emit updateStatus(DebuggerUI::AwaitingConnection); debuggerInterface()->enableAction("debug_connect", false); debuggerInterface()->enableAction("debug_disconnect", true); debuggerInterface()->enableAction("debug_request", true); } else { - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); delete m_server; m_server = NULL; debuggerInterface()->enableAction("debug_connect", true); @@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession() debuggerInterface()->enableAction("debug_leap", false); debuggerInterface()->enableAction("debug_pause", false); - emit updatetqStatus(DebuggerUI::NoSession); + emit updateStatus(DebuggerUI::NoSession); } // Change executionstate of the script @@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("pause", (char*)0L); sendCommand("sendactiveline", (char*)0L); if(isActive()) - emit updatetqStatus(DebuggerUI::Paused); + emit updateStatus(DebuggerUI::Paused); } else if(newstate == Run) { @@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("run", (char*)0L); if(isActive()) - emit updatetqStatus(DebuggerUI::Running); + emit updateStatus(DebuggerUI::Running); } else if(newstate == Trace) { @@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("trace", (char*)0L); if(isActive()) - emit updatetqStatus(DebuggerUI::Tracing); + emit updateStatus(DebuggerUI::Tracing); } m_executionState = newstate; @@ -259,14 +259,14 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; - debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false); + debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false); } } if(m_server && m_server->error()) { kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl; - debuggerInterface()->showtqStatus(m_server->errorString(), false); + debuggerInterface()->showStatus(m_server->errorString(), false); } } @@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept() connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); connected(); - emit updatetqStatus(DebuggerUI::Connected); + emit updateStatus(DebuggerUI::Connected); } else { @@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Connection established void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &) { - emit updatetqStatus(DebuggerUI::Connected); + emit updateStatus(DebuggerUI::Connected); connected(); } @@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() debuggerInterface()->setActiveLine("", 0); - emit updatetqStatus(DebuggerUI::AwaitingConnection); + emit updateStatus(DebuggerUI::AwaitingConnection); m_active = false; } @@ -445,9 +445,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); + msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); - debuggerInterface()->showtqStatus(msg, false); + debuggerInterface()->showStatus(msg, false); } // New current line else if(m_command == "setactiveline") @@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Parsing failed else if(m_command == "parsefailed") { - debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true); + debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true); return; } // A debugging session is running @@ -479,7 +479,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_command == "error") { // Put the line number first so double clicking will jump to the corrrect line - debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true); + debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true); // Filter to get error code only and match it with out mask long error = args["errnum"].toLong(); @@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else setExecutionState(Pause); - emit updatetqStatus(DebuggerUI::HaltedOnError); + emit updateStatus(DebuggerUI::HaltedOnError); } // We came across a hard coded breakpoint else if(m_command == "forcebreak") { setExecutionState(Pause); - emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true); + emit updateStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showStatus(i18n("Breakpoint reached"), true); } // A conditional breakpoint was fulfilled else if(m_command == "conditionalbreak") { setExecutionState(Pause); - emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true); + emit updateStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true); } // There is a breakpoint set in this file/line else if(m_command == "removebreakpoint") @@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // We're about to debug a file.. else if(m_command == "initialize") { - debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false); + debuggerInterface()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false); sendCommand("sendprotocolversion", (char*)0L); debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0); @@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Reached en of an include else if(m_command == "end") { - //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true); + //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true); return; } // Check protocol version @@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) { if(args["version"] != protocolversion) { - debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); + debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); sendCommand("die", (char*)0L); } return; @@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); - buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length()); + buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } @@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) { StringMap::Iterator it; // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;} - TQString ret = TQString("a:%1:{").tqarg(args.size()); + TQString ret = TQString("a:%1:{").arg(args.size()); for( it = args.begin(); it != args.end(); ++it ) { bool isNumber; @@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) it.data().toInt(&isNumber); if(isNumber && !it.data().isEmpty()) ret += TQString("s:%1:\"%2\";i:%3;") - .tqarg(it.key().length()) - .tqarg(it.key()) - .tqarg(it.data()); + .arg(it.key().length()) + .arg(it.key()) + .arg(it.data()); else ret += TQString("s:%1:\"%2\";s:%3:\"%4\";") - .tqarg(it.key().length()) - .tqarg(it.key()) - .tqarg(it.data().length()) - .tqarg(it.data()); + .arg(it.key().length()) + .arg(it.key()) + .arg(it.data().length()) + .arg(it.data()); } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 4663d9fa..d041e90d 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -148,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient void slotReadyAccept(); signals: - void updatetqStatus(DebuggerUI::DebuggertqStatus); + void updateStatus(DebuggerUI::DebuggerStatus); }; #endif diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 88b5460e..97140dbb 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -43,7 +43,7 @@ bool DebuggerClient::isActive() void DebuggerClient::unSupportedAction(const TQString &action) { - KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function")); } @@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*) // Unimplemented defaults void DebuggerClient::showConfig(TQDomNode) { - KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings")); + KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings")); } // Unimplemented defaults @@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode) // Unimplemented defaults: add watch void DebuggerClient::addWatch(const TQString &) { - KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: Remove watch void DebuggerClient::removeWatch(DebuggerVariable *) { // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place... - KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: set value of varialbe void DebuggerClient::variableSetValue(const DebuggerVariable &) { - KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function")); } #include "debuggerclient.moc" diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index 317ff3e3..69ba5650 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -109,7 +109,7 @@ class DebuggerClient : public TQObject DebuggerInterface *debuggerInterface(); signals: - void updatetqStatus(DebuggerUI::DebuggertqStatus); + void updateStatus(DebuggerUI::DebuggerStatus); }; diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index dabd685d..cf634884 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -44,7 +44,7 @@ class DebuggerInterface : public TQObject virtual void havenoBreakpoint (const TQString& file, int line) = 0; // Public help functions - virtual bool showtqStatus(const TQString& message, bool log) = 0; + virtual bool showStatus(const TQString& message, bool log) = 0; virtual bool setActiveLine (const TQString& file, int line) = 0; virtual void enableAction(const TQString& action, bool enable) = 0; diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp index 96e4f628..c38e2fec 100644 --- a/quanta/components/debugger/pathmapper.cpp +++ b/quanta/components/debugger/pathmapper.cpp @@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con TQString translated = path; // Check if this dir is matched by the maps - if(path.tqstartsWith(from, false)) + if(path.startsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 671bb871..7f6f4027 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged() translated = m_path; // Check if this dir is matched by the maps - if(m_path.tqstartsWith(from, false)) + if(m_path.startsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index c0f27c04..58a79167 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -109,7 +109,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>ledTranslationExists</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index 385849a5..af70da0a 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line) } // Public help functions -bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log) +bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log) { - return m_manager->showtqStatus(message, log); + return m_manager->showStatus(message, log); } bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line) diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index 9c2ba724..5b9b5480 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -43,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface void refreshBreakpoints(); // Public help functions - bool showtqStatus(const TQString& message, bool log); + bool showStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line) ; void enableAction(const TQString& action, bool enable); diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 72e4afa3..b8a6847b 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdeversion.h> #include <kinputdialog.h> -#include <tqclipboard.h> +#include <clipboard.h> // Quanta includes #include "variableslistview.h" @@ -39,7 +39,7 @@ namespace VariablesListViewColumns enum Columns { Name = 0, - tqStatus, + Status, Value, Type, Size @@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab { KListViewItem * item; - // Remove tqchildren that doesen't exist anymore + // Remove children that doesen't exist anymore TQPtrList<DebuggerVariable> oldlist = oldvar->values(); for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev()) { @@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab oldvar->deleteChild(oldchild); } - // Update and add tqchildren + // Update and add children TQPtrList<DebuggerVariable> newlist = newvar->values(); for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev()) { @@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab item = oldvar->item(); if(oldvar->value() != newvar->value()) - item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok")); + item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok")); else - item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap()); + item->setPixmap(VariablesListViewColumns::Status, KPixmap()); oldvar->copy(newvar, false); @@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( ) if(!v) return; - quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name())); + quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name())); quantaApp->messageOutput()->showMessage(v->value()); quantaApp->messageOutput()->showMessage("<<<\n"); } @@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( ) DebuggerVariable *v = selected(true); if(!v) return; - TQApplication::tqclipboard()->setText(v->value()); + TQApplication::clipboard()->setText(v->value()); } #include "variableslistview.moc" diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index 528da3ea..79e105be 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -29,7 +29,7 @@ class areaAttribute : public TQObject{ TQ_OBJECT private: - TQRect m_tqgeometry; + TQRect m_geometry; TQMap<TQString,TQString> m_attributeMap; //tag specific attributes public: @@ -38,13 +38,13 @@ class areaAttribute : public TQObject{ void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; } void setAllAttributes(TQMap<TQString,TQString> map){ m_attributeMap = map; } void resetAttributes(); - TQRect tqgeometry() const { return m_tqgeometry; } + TQRect geometry() const { return m_geometry; } TQString src() const{ return m_attributeMap["src"]; } TQString attributeValue(TQString l) const { return attributeMap()[l];} TQMap<TQString,TQString> attributeMap() const { return m_attributeMap; } public slots: - void setGeometry(TQRect g) { m_tqgeometry = g; } + void setGeometry(TQRect g) { m_geometry = g; } }; #endif diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui index 46a5354a..3e024de5 100644 --- a/quanta/components/framewizard/fmfpeditors.ui +++ b/quanta/components/framewizard/fmfpeditors.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>55</width> <height>0</height> @@ -510,7 +510,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui index e0a8926c..c977d86f 100644 --- a/quanta/components/framewizard/fmrceditors.ui +++ b/quanta/components/framewizard/fmrceditors.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>300</width> <height>150</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>0</height> diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index cde1611f..3a3a1efd 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index 80c7aa00..c168e323 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){ } break; case TQEvent::Resize : { - emit Resized( view()->tqgeometry() ); + emit Resized( view()->geometry() ); view()->hide(); view()->show(); return true; diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index 2faaf3d6..fd1f187f 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -20,7 +20,7 @@ static const int SIZE = 101; treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){ - m_tqchildrenList.setAutoDelete(true); + m_childrenList.setAutoDelete(true); m_atts = new areaAttribute; } @@ -29,16 +29,16 @@ treeNode::~treeNode(){ } void treeNode::addChildNode(const TQString &l) { - m_tqchildrenList.append( new treeNode(l,m_label) ); + m_childrenList.append( new treeNode(l,m_label) ); } void treeNode::removeChildNode(const TQString &l,bool autoDelete) { - m_tqchildrenList.setAutoDelete(autoDelete); - m_tqchildrenList.remove(findChild(l)); + m_childrenList.setAutoDelete(autoDelete); + m_childrenList.remove(findChild(l)); } treeNode* treeNode::findChild(const TQString &l){ - TQPtrListIterator<treeNode> it( m_tqchildrenList ); + TQPtrListIterator<treeNode> it( m_childrenList ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; @@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){ n->nextChild(); } - TQPtrList<treeNode> list = n->tqchildrenList(); + TQPtrList<treeNode> list = n->childrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node= it.current(); - TQRect newGeometry = n->atts()->tqgeometry(); + TQRect newGeometry = n->atts()->geometry(); if(n->splitType()==VERTICAL){ - newGeometry.setHeight(node->atts()->tqgeometry().height()); + newGeometry.setHeight(node->atts()->geometry().height()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().width(); + dim += node->atts()->geometry().width(); dim += 6; } newGeometry.setWidth(dim); } else if(n->splitType()==HORIZONTAL){ - newGeometry.setWidth(node->atts()->tqgeometry().width()); + newGeometry.setWidth(node->atts()->geometry().width()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().height(); + dim += node->atts()->geometry().height(); dim += 6; } newGeometry.setHeight(dim); diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index c96d9b17..82d312fb 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -33,36 +33,36 @@ class treeNode { TQString m_label, m_parentLabel; SplitType m_splitType; - TQPtrList<treeNode> m_tqchildrenList; + TQPtrList<treeNode> m_childrenList; areaAttribute *m_atts; public: treeNode(const TQString &l=TQString(), const TQString &pl=TQString()); ~treeNode(); void addChildNode(const TQString &L); - void addChildNode(treeNode *n){ m_tqchildrenList.append(n); } + void addChildNode(treeNode *n){ m_childrenList.append(n); } void removeChildNode(const TQString &l, bool autoDelete); void setSplitType(SplitType s) { m_splitType = s; } void setLabel(const TQString &l) { m_label = l; } - void removeChildren() { m_tqchildrenList.clear(); } + void removeChildren() { m_childrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_tqchildrenList.find(n); } - bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } + int childPosition(treeNode* n){ return m_childrenList.find(n); } + bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); } TQString label() const { return m_label; } TQString parentLabel() const { return m_parentLabel; } SplitType splitType() const { return m_splitType; } - TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; } + TQPtrList<treeNode> childrenList() { return m_childrenList; } - treeNode* firstChild() { return m_tqchildrenList.first(); } - treeNode* nextChild() { return m_tqchildrenList.next(); } - treeNode* lastChild() { return m_tqchildrenList.last(); } - treeNode* currentChild() { return m_tqchildrenList.current(); } + treeNode* firstChild() { return m_childrenList.first(); } + treeNode* nextChild() { return m_childrenList.next(); } + treeNode* lastChild() { return m_childrenList.last(); } + treeNode* currentChild() { return m_childrenList.current(); } treeNode* findChild(const TQString &L); areaAttribute* atts() { return m_atts; } - int countChildren() const { return m_tqchildrenList.count(); } - bool hasChildren() const { return !m_tqchildrenList.isEmpty(); } + int countChildren() const { return m_childrenList.count(); } + bool hasChildren() const { return !m_childrenList.isEmpty(); } }; class tree{ diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index e822d7e0..4b1f62f3 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){ void VisualFrameEditor::setGeometries(const TQString &l){ int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren()); - TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry()); - TQPtrList<treeNode> list=m_internalTree->findNode(l)->tqchildrenList(); + TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry()); + TQPtrList<treeNode> list=m_internalTree->findNode(l)->childrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; if(m_internalTree->findNode(l)->splitType() == VERTICAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){ } else if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -145,12 +145,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); - TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -171,12 +171,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); - TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -258,7 +258,7 @@ void VisualFrameEditor::removeNode(const TQString &l){ m_internalTree->findNode(parentLabel)->setSplitType(NONE); } else { - TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList(); + TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList(); if( parentLabel != m_internalTree->root()->label() ) { TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); @@ -304,7 +304,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; - sa->view()->setGeometry(n->atts()->tqgeometry()); + sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); @@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) { int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn switch( n->splitType() ) { - case VERTICAL: percentage/=n->atts()->tqgeometry().width(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width(); + case VERTICAL: percentage/=n->atts()->geometry().width(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width(); break; - case HORIZONTAL: percentage/=n->atts()->tqgeometry().height(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height(); + case HORIZONTAL: percentage/=n->atts()->geometry().height(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height(); break; default:break; } diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index c7338128..39bb4b4c 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -50,7 +50,7 @@ class VisualFrameEditor : public TQHBox { public: VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); ~VisualFrameEditor(); - void draw() { tqrepaint(); } + void draw() { repaint(); } void loadExistingStructure(const TQStringList &list); TQString framesetStructure(); void removeNode(const TQString &l); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index a94c15e4..45bcf07c 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -204,7 +204,7 @@ void TableEditor::slotEditRow() void TableEditor::slotEditCol() { - KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1)); + KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1)); TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col")); dlg.exec(); } @@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(nCol); for (int i = 0; i < colValue - 1; i++) { - setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol)); + setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol)); m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -924,7 +924,7 @@ void TableEditor::slotRemoveRow() int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt(); rowspan--; if (rowspan > 1) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan)); else mainTableNode->node->tag->deleteAttribute("rowspan"); updatedMainNodes.append(mainTableNode); @@ -975,7 +975,7 @@ void TableEditor::slotRemoveCol() int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt(); colspan--; if (colspan > 1) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan)); else mainTableNode->node->tag->deleteAttribute("colspan"); updatedMainNodes.append(mainTableNode); @@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells() rCol = selection.rightCol(); TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]); if (rCol - lCol > 0) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1)); if (bRow - tRow > 0) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1)); for (int i = 0; i < bRow - tRow + 1; i++) for (int j = 0; j < rCol - lCol + 1; j++) { if (i != 0 || j != 0) { - setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1)); + setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1)); m_dataTable->item(tRow + i, lCol + j)->setEnabled(false); TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]); Node::deleteNode(tableNode->node); @@ -1271,7 +1271,7 @@ void TableEditor::configureCell(int row, int col, Node * node) return; // Header (TH) or standard cell? item->setHeader(node->tag->name.lower() == "th"); - //Qt::Horizontal tqalignment + //Qt::Horizontal alignment TQt::AlignmentFlags flags; TQString align = node->tag->attributeValue("align", true); if (align == "right") @@ -1284,8 +1284,8 @@ void TableEditor::configureCell(int row, int col, Node * node) flags = TQt::AlignHCenter; // TH is centered by default else flags = TQt::AlignLeft; - item->tqsetAlignment(flags); - //Qt::Vertical tqalignment + item->setAlignment(flags); + //Qt::Vertical alignment TQString valign = node->tag->attributeValue("valign", true); if (valign == "top") flags = TQt::AlignTop; diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index f74a2620..29511351 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>276</width> <height>20</height> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>276</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> @@ -392,7 +392,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index c2f4e298..aed532d1 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include <tqtextedit.h> +#include <textedit.h> #include <tqpainter.h> #include "tableitem.h" @@ -84,9 +84,9 @@ void TableItem::paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bo p->drawText(4, 4, cr0.width()-8, cr0.height()-8, m_halign | m_valign | WordBreak, text()); } -TQSize TableItem::tqsizeHint() const +TQSize TableItem::sizeHint() const { - TQSize size = TQTableItem::tqsizeHint(); + TQSize size = TQTableItem::sizeHint(); size.setWidth(size.width()+8); size.setHeight(size.height()+8); return size; diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h index 12e2b4b0..017738bf 100644 --- a/quanta/components/tableeditor/tableitem.h +++ b/quanta/components/tableeditor/tableitem.h @@ -35,16 +35,16 @@ public: virtual TQWidget* createEditor() const; // Get text from TQTextEdit virtual void setContentFromEditor(TQWidget *w); - // Paint cell - handle tqalignment (horizontal and vertical) and bold for header + // Paint cell - handle alignment (horizontal and vertical) and bold for header virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected); - // Return A bit larger tqsizeHint because TQTextEdit has some margin around - virtual TQSize tqsizeHint() const; + // Return A bit larger sizeHint because TQTextEdit has some margin around + virtual TQSize sizeHint() const; // Get and set vertical aligment TQt::AlignmentFlags vAlignment() {return m_valign;} void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;} // Get and set horizontal aligment - TQt::AlignmentFlags tqalignment() {return m_halign;} - void tqsetAlignment(TQt::AlignmentFlags flags) {m_halign = flags;} + TQt::AlignmentFlags alignment() {return m_halign;} + void setAlignment(TQt::AlignmentFlags flags) {m_halign = flags;} // Get and set header status (use true for TH, false for TD) bool header() {return m_header;} void setHeader(bool h) {m_header = h;} diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index d5cace16..d8e44d45 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -190,7 +190,7 @@ void ActionConfigDialog::slotRemoveToolbar() } if (s != i18n("All")) { - if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); @@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction() p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance()); } TQWidget *toolBar = tb->page(i); - if (toolBar->tqminimumSizeHint().height() > 20) + if (toolBar->minimumSizeHint().height() > 20) { toolBar->adjustSize(); toolBar->setGeometry(0,0, tb->width(), toolBar->height()); @@ -765,7 +765,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). - tqarg(shortcutText).tqarg(global); + arg(shortcutText).arg(global); KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts")); } } @@ -805,7 +805,7 @@ void ActionConfigDialog::slotNewAction() static_cast<TagAction*>(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); TQListViewItem *item = new KListViewItem(allActionsItem); - TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count()); + TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); item->setText(0, actionText); @@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction() void ActionConfigDialog::slotDeleteAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").arg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { TQString actionName = currentAction->name(); emit deleteUserAction(currentAction); diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index d834bea7..fba7eaf9 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -160,7 +160,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="name"> <cstring>buttonOk</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -311,13 +311,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -521,7 +521,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>20</height> @@ -740,7 +740,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>55</width> <height>20</height> diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui index f3370603..6670afb0 100644 --- a/quanta/dialogs/casewidget.ui +++ b/quanta/dialogs/casewidget.ui @@ -12,7 +12,7 @@ <height>158</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>100</height> diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui index 3bca0951..597fbcd6 100644 --- a/quanta/dialogs/debuggeroptionss.ui +++ b/quanta/dialogs/debuggeroptionss.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>220</height> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui index 50783723..b5331bb1 100644 --- a/quanta/dialogs/dirtydialog.ui +++ b/quanta/dialogs/dirtydialog.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>220</height> @@ -106,7 +106,7 @@ <property name="text"> <string>(If you later save the document, you will lose what was on the disk.)</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 972c4828..70d06c86 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -41,7 +41,7 @@ DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool creat m_busy = false; m_createBackup = createBackup; m_mainWidget = new DirtyDialog(this); - m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").tqarg(srcName)); + m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").arg(srcName)); setMainWidget(m_mainWidget); } diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index c06a9c2f..ca0135df 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>365</width> <height>20</height> @@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index b2455cf7..cd6a079b 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -21,7 +21,7 @@ <height>161</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>440</width> <height>160</height> @@ -45,7 +45,7 @@ Dialog message2:</string> <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index 28f00ce3..c2595716 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral() void DTEPEditDlg::readPages() { int i = 1; - while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6) + while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6) { - m_config->setGroup(TQString("Page%1").tqarg(i)); + m_config->setGroup(TQString("Page%1").arg(i)); TQString title = m_config->readEntry("Title"); TQString groups = m_config->readEntry("Groups"); if (i == 1) @@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult() { if (f.exists()) { - if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) { targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As")); } else @@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config) if (enablePage1->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit1->text()); writeEntry(config, "Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit2->text()); writeEntry(config, "Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit3->text()); writeEntry(config, "Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit4->text()); writeEntry(config, "Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit5->text()); writeEntry(config, "Groups", groupsEdit5->text()); } @@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures() int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1); int i = 1; - while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i))) + while (m_config->hasGroup(TQString("StructGroup_%1").arg(i))) { StructGroup group; - m_config->setGroup(TQString("StructGroup_%1").tqarg(i)); + m_config->setGroup(TQString("StructGroup_%1").arg(i)); group.name = m_config->readEntry("Name"); group.noName = m_config->readEntry("No_Name"); group.icon = m_config->readEntry("Icon"); @@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) for (TQValueList<StructGroup>::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(TQString("StructGroup_%1").tqarg(i)); + config->setGroup(TQString("StructGroup_%1").arg(i)); writeEntry(config, "Name", group.name); writeEntry(config, "No_Name", group.noName); writeEntry(config, "Icon", group.icon); @@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup() int currentItem = structuresList->currentItem(); if (currentItem != -1) { - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) { m_structGroups.remove(m_structGroups.at(currentItem)); structuresList->removeItem(currentItem); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index ef7e47c7..e0d29eae 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -505,7 +505,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -535,7 +535,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -1069,7 +1069,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="text"> <string>False:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -1083,7 +1083,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="text"> <string>True:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -1097,7 +1097,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -1647,7 +1647,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>270</height> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 059c783d..802f6753 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -57,7 +57,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>50</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -482,7 +482,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 636559ce..848814f3 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ // QT includes -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqpushbutton.h> @@ -35,7 +35,7 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) baseURL = a_baseURL; m_absolutePath = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); combo->setEditable(true); @@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - tqlayout ->addWidget( combo ); - tqlayout ->addWidget( button ); + layout ->addWidget( combo ); + layout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -58,7 +58,7 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) { baseURL.setPath("."); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); button = new TQPushButton(this); @@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - tqlayout ->addWidget( combo ); - tqlayout ->addWidget( button ); + layout ->addWidget( combo ); + layout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index e5066449..ec85fa91 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -21,7 +21,7 @@ <height>150</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>150</height> @@ -35,7 +35,7 @@ <property name="name"> <cstring>pixmapLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index 007fbba4..10950ae7 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 46805d0e..bfaae460 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -17,8 +17,8 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqlineedit.h> -#include <tqtextedit.h> -#include <tqtextstream.h> +#include <textedit.h> +#include <textstream.h> #include <tqtimer.h> //kde includes @@ -97,7 +97,7 @@ void AbbreviationDlg::slotNewGroup() { if (qConfig.abbreviations.contains(groupName)) { - KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").tqarg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").arg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").tqarg(s)); + KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").arg(s)); } } diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 0c9c232a..b73e902b 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 82d1976f..7a1367b9 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -21,7 +21,7 @@ <height>72</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>70</height> diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index e4c408d3..7fe28ce1 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -73,7 +73,7 @@ <property name="name"> <cstring>lineMarkup</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> </widget> @@ -81,7 +81,7 @@ <property name="name"> <cstring>lineImage</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> </widget> @@ -130,7 +130,7 @@ <property name="name"> <cstring>lineText</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> </widget> @@ -146,7 +146,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>153</width> <height>20</height> @@ -183,7 +183,7 @@ <property name="name"> <cstring>lineScript</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> </widget> @@ -196,7 +196,7 @@ <property name="text"> <string>Default character &encoding:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -270,7 +270,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 2637e71d..14095623 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>122</width> <height>20</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>122</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index e1df2225..2df03ea9 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -31,9 +31,9 @@ PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) PreviewOptions::~PreviewOptions(){ } -void PreviewOptions::setWindowLayout(const TQString& tqlayout ) +void PreviewOptions::setWindowLayout(const TQString& layout ) { - if ( tqlayout == "Default") resetLayout->setChecked(true); + if ( layout == "Default") resetLayout->setChecked(true); else resetLayout->setChecked(false); } @@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition() return position; } -TQString PreviewOptions::tqlayout() +TQString PreviewOptions::layout() { - TQString tqlayout = "Custom"; + TQString layout = "Custom"; if ( resetLayout->isChecked() ) - tqlayout = "Default"; - return tqlayout; + layout = "Default"; + return layout; } TQString PreviewOptions::closeButtons() diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index 24f1a765..a3cce15e 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -30,7 +30,7 @@ public: ~PreviewOptions(); TQString position(); - TQString tqlayout(); + TQString layout(); TQString closeButtons(); TQString docPosition(); uint toolviewTabs(); diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui index 02bdc979..821cdfcc 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -21,7 +21,7 @@ <height>512</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>220</height> @@ -36,7 +36,7 @@ <cstring>resetLayout</cstring> </property> <property name="text"> - <string>Reset window tqlayout to the default on the next startup</string> + <string>Reset window layout to the default on the next startup</string> </property> </widget> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index e14cfda6..397c99af 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>410</width> <height>250</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -183,8 +183,8 @@ <string>Automatic &replacement of the accented characters</string> </property> <property name="whatsThis" stdset="0"> - <string>If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their tqunicode style notation, for the above case with <b>&#038;#225;</b>.<br> -We suggest to leave this option off and use an tqunicode or locale encoding for your documents.</string> + <string>If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their unicode style notation, for the above case with <b>&#038;#225;</b>.<br> +We suggest to leave this option off and use an unicode or locale encoding for your documents.</string> </property> </widget> </grid> diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 23c372e1..01cb53ad 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -17,7 +17,7 @@ #include <tqfile.h> #include <tqpushbutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <klocale.h> diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index e45807c8..d29bd1ba 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -34,7 +34,7 @@ <property name="name"> <cstring>buttonOk</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -54,7 +54,7 @@ <property name="name"> <cstring>buttonChar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>112</width> <height>20</height> @@ -85,7 +85,7 @@ <property name="name"> <cstring>buttonCancel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index b3af1391..cc0fa2fc 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -24,7 +24,7 @@ // KColorDialog::getColor() so that in contains a parent argument. This // improves centering capability. // -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> // @@ -37,7 +37,7 @@ #include <tqfile.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <tqvalidator.h> #include <tqpainter.h> diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index 398ddca4..ac7ed429 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 0d6de8ed..713ccf2c 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) } listbox->setMinimumSize(350,150); adjustSize(); - resize(tqsizeHint()); + resize(sizeHint()); connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); } diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 07123b7c..65102ba8 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - tqrepaint(); + repaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 08e4a42d..8103db31 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -24,7 +24,7 @@ //qt includes #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> //app includes #include "tagattr.h" diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index ac9c8ffc..93ced2c5 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"%1\">\n").tqarg(dtdTag->name()); + docString += TQString("<tag name=\"%1\">\n").arg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "</tag>\n</TAGS>\n"; doc.setContent(docString); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").tqarg(i)); + dtdConfig->setGroup(TQString("Page%1").arg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"Page%1\">\n").tqarg(i); + docString += TQString("<tag name=\"Page%1\">\n").arg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index a761d62c..8639a16f 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -13,7 +13,7 @@ #include <knumvalidator.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include "pictureview.h" diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index 84be37bc..e7a71fa1 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -39,7 +39,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui index 24db77c7..f4842d4c 100644 --- a/quanta/dialogs/tagdialogs/tagmisc.ui +++ b/quanta/dialogs/tagdialogs/tagmisc.ui @@ -21,7 +21,7 @@ <height>61</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>60</height> diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 2b126d26..8a69d647 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqwhatsthis.h> diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 543fe734..1d97652e 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -17,7 +17,7 @@ #include <tqmap.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kdebug.h> @@ -84,7 +84,7 @@ void AnnotationOutput::tabChanged(TQWidget *w) void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation) { line++; - TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first); + TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first); s.replace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -155,7 +155,7 @@ void AnnotationOutput::readAnnotations() TQString text = el.attribute("text"); TQString receiver = el.attribute("receiver"); text.replace('\n',' '); - TQString lineText = TQString("%1").tqarg(line); + TQString lineText = TQString("%1").arg(line); if (lineText.length() < 20) { TQString s; @@ -198,7 +198,7 @@ void AnnotationOutput::readAnnotations() } if (m_yourAnnotationsNum > 0) { - setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum)); + setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum)); } else { setTabLabel(m_yourAnnotations, i18n("For You")); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 94bfecfb..ef9e2058 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -25,9 +25,9 @@ #include <kiconloader.h> // TQt includes -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "messageoutput.h" #include "messageitem.h" @@ -146,7 +146,7 @@ TQString MessageOutput::content() void MessageOutput::copyContent() { - kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); + kapp->clipboard()->setText(content(), TQClipboard::Clipboard); } void MessageOutput::saveContent() @@ -159,13 +159,13 @@ void MessageOutput::saveContent() TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>") - .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) + .arg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) return; TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>") - .tqarg(url.url())); + .arg(url.url())); return; } diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 5008dcff..92e1e8f8 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -124,7 +124,7 @@ bool DTD::parseDTD(const KURL &url) TQString fileName = TQString(); if (!KIO::NetAccess::download(url, fileName)) { - KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } TQFile file(fileName); @@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url) parseDTD(entityURL); } else { - kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl; + kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl; } if (it != lines.end()) ++it; diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index b384e456..24d7c529 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -75,7 +75,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQString fileName = TQString(); if (!KIO::NetAccess::download(m_dtdURL, fileName, 0)) { - KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); return false; } DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length())); @@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) xmlErrorPtr errorPtr = xmlGetLastError(); if (errorPtr != NULL) { - TQString s = TQString::tqfromLatin1(errorPtr->message); + TQString s = TQString::fromLatin1(errorPtr->message); if (!s.isEmpty()) errorStr = s; - s = TQString::tqfromLatin1(errorPtr->str1); + s = TQString::fromLatin1(errorPtr->str1); if (!s.isEmpty()) errorStr += "<br>" + s; - s = TQString::tqfromLatin1(errorPtr->str2); + s = TQString::fromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "<br>" + s; - s = TQString::tqfromLatin1(errorPtr->str2); + s = TQString::fromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "<br>" + s; - errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2); + errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); xmlResetError(errorPtr); } #endif - KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").tqarg(errorStr)); + KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr)); return false; } if (targetDir.isEmpty()) @@ -155,7 +155,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) } else { KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the parent folder.</qt>") - .tqarg(file.name())); + .arg(file.name())); return false; } } @@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) if (childNum > 0) { - stream << "<tqchildren>" << endl; + stream << "<children>" << endl; for( int i = 0; i < childNum; i++ ) { stream << " <child name=\"" << TQString((const char*)list_ptr[i]) << "\""; @@ -293,14 +293,14 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) stream << " />" << endl; } - stream << "</tqchildren>" << endl; + stream << "</children>" << endl; stream << endl; } /* xmlElementContentPtr content_ptr = el_ptr->content; if (content_ptr) { - stream << "<tqchildren>" << endl; + stream << "<children>" << endl; while (content_ptr) { if (!TQString((const char*)content_ptr->name).isEmpty()) @@ -335,7 +335,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) content_ptr = content_ptr->parent; } } - stream << "</tqchildren>" << endl; + stream << "</children>" << endl; } */ } stream << "</tag>" << endl diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui index db29d504..8c55bbcd 100644 --- a/quanta/parsers/dtd/dtepcreationdlg.ui +++ b/quanta/parsers/dtd/dtepcreationdlg.ui @@ -21,7 +21,7 @@ <height>285</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>200</height> diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index 8206ac29..261d4f97 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -23,7 +23,7 @@ #include <tqstrlist.h> #include <tqdatetime.h> #include <tqfile.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqvaluelist.h> #include <tqvaluestack.h> @@ -860,7 +860,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) j = 0; if (!closesPrevious) { - //move the tqchildren up one level + //move the children up one level Node *n = child; Node *m = child; while (n) @@ -900,7 +900,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) } } else { - //change the parent of tqchildren, so the prev will be the new parent + //change the parent of children, so the prev will be the new parent if (child) { Node *n = child; @@ -928,7 +928,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) prev->child = child; } } - //move down the nodes starting with next one level and append to the list of tqchildren of prev + //move down the nodes starting with next one level and append to the list of children of prev if (next) { if (prev->child) //if the previous node has a child, append the next node after the last child @@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w) return n; } - kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").tqarg(area.bLine).tqarg(area.bCol).tqarg(area.eLine).tqarg(area.eCol) << "\n"; + kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n"; // kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl; deleteNodes(firstNode->nextSibling(), lastNode, modifs); diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index 9d1f9d0d..be660255 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -174,7 +174,7 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin tag->setDtd(d); else tag->setDtd(dtd); - tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper()); + tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper()); tag->type = Tag::ScriptTag; tag->validXMLTag = false; diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h index f19bcf5d..3f74a42f 100644 --- a/quanta/parsers/qtag.h +++ b/quanta/parsers/qtag.h @@ -243,7 +243,7 @@ public: void setScope(TQString const& scope) {m_scope = scope;} /** Returns true if tag is a possible child of this tag, or if - there are no tqchildren defined and if trueIfNoChildsDefined is set to true. */ + there are no children defined and if trueIfNoChildsDefined is set to true. */ bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true); //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes! bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false); diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 1dab9ccc..f402e0c8 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -201,7 +201,7 @@ bool SAParser::slotParseOneLine() } s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = groupKeywordPos - 1; - //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_currentNode && (s_currentNode->tag->type == Tag::Text || @@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine() s_currentNode->specialInsideXml = m_specialInsideXml; } } - //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl; + //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl; //create a closing node for the special area Tag *tag = new Tag(); @@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine() s_currentNode = node; } } - //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").tqarg(s_currentContext.type).tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; s_currentContext = s_context; s_col = s_context.area.bCol + s_context.startString.length(); @@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine() // if (pos != 0) pos++; s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos; - //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_fullParse) { if ( s_currentNode && @@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine() s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1; s_currentContext.type = s_previousContext.type; - //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_fullParse) { @@ -649,7 +649,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, int s_startCol = specialArea.bCol; s_endLine = specialArea.eLine; s_endCol = specialArea.eCol; - //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl; + //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl; s_searchForAreaEnd = false; s_searchForForcedAreaEnd = false; diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index c8d4c6c9..1fe4505a 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -22,7 +22,7 @@ #include <khtml_part.h> #include <klocale.h> #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <dom/dom_text.h> #include "domtreeview.moc" @@ -140,7 +140,7 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl ) : TQDialog(parent, name, modal, fl) { - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout"); domview = new DOMTreeView(this, part, name); domview->setTitle(i18n( "Debugging KafkaWidget DOM Tree " )); diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui index de2293dd..c826dd73 100644 --- a/quanta/parts/kafka/htmldocumentpropertiesui.ui +++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>listView1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>0</width> <height>0</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>86</height> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>84</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>226</width> <height>21</height> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -374,7 +374,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 5d7e8cdb..32f5f43c 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -999,7 +999,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, if(!node) return 0L; - //Reset the listviews items pointers for node and its tqchildren + //Reset the listviews items pointers for node and its children n = node; b = false; while(n) @@ -1100,7 +1100,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N if(!node) return 0L; - //Reset the listviews items pointers for node and its tqchildren + //Reset the listviews items pointers for node and its children n = node; b = false; while(n) @@ -2253,7 +2253,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh modif->setType(NodeModif::NodeRemoved); modif->setLocation(getLocation(node)); - //log the tqchildren move if we don't extract the tqchildren + //log the children move if we don't extract the children if(!extractChildren) { location = getLocation(node); diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h index 80a82122..6322919d 100644 --- a/quanta/parts/kafka/kafkacommon.h +++ b/quanta/parts/kafka/kafkacommon.h @@ -522,8 +522,8 @@ public: * This mean that the undo/redo system will delete it when necessary so don't reuse it!!!! * @param node The node to delete. * @param modifs The changes made are logged into modifs. - * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check - * if the tqchildren of node are legal childs of the parent of node. + * @param extractChilds If we extract or move up the children. WARNING: it don't check + * if the children of node are legal childs of the parent of node. * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag. * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g. * <a href="<? boo ?>" > : the PHP block is an embedded block. @@ -588,7 +588,7 @@ public: /** * An enumeration of all the possible return states of DTDExtractNode */ - enum extractNodetqStatus + enum extractNodeStatus { //The node to extract was not found. nothingExtracted = 0, @@ -619,7 +619,7 @@ public: * @param cursorOffset The offset of the cursor inside cursorNode. * </TEMPORARY> * @param modifs The usual modifs to log the modifications made for the undo/redo system. - * @return Returns a kafkaCommon::extractNodetqStatus. + * @return Returns a kafkaCommon::extractNodeStatus. */ static int DTDExtractNode(const TQString &nodeName, Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset, @@ -986,7 +986,7 @@ public: /** * Returns the position of the child domNode. * @param domNode This is the DOM::Node we want the position. - * @return Returns the position of domNode inside domNode's parent's tqchildren or -1 if not found. + * @return Returns the position of domNode inside domNode's parent's children or -1 if not found. */ static int childPosition(DOM::Node domNode); diff --git a/quanta/parts/kafka/kafkadragobject.cpp b/quanta/parts/kafka/kafkadragobject.cpp index 40aeac9a..5a614b23 100644 --- a/quanta/parts/kafka/kafkadragobject.cpp +++ b/quanta/parts/kafka/kafkadragobject.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "kafkadragobject.h" #include "node.h" @@ -51,7 +51,7 @@ KafkaDragObject::KafkaDragObject(Node const* item, TQWidget* dragSource, const c KafkaDragObject::~KafkaDragObject() {} -TQByteArray KafkaDragObject::tqencodedData(const char* mimetype) const +TQByteArray KafkaDragObject::encodedData(const char* mimetype) const { if(m_mimetype == mimetype) return m_array; @@ -74,7 +74,7 @@ bool KafkaDragObject::decode(TQMimeSource* e, Node* node) if(!node || !e->provides(m_mimetype)) return false; - TQByteArray data = e->tqencodedData(m_mimetype); + TQByteArray data = e->encodedData(m_mimetype); //kdDebug(25001) << TQString(data) << endl; TQDomDocument doc; doc.setContent(data, false); diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h index 65cf24a5..cc371b45 100644 --- a/quanta/parts/kafka/kafkadragobject.h +++ b/quanta/parts/kafka/kafkadragobject.h @@ -35,7 +35,7 @@ public: KafkaDragObject(Node const* item, TQWidget* dragSource = 0, const char* name = 0); ~KafkaDragObject(); - TQByteArray tqencodedData(const char* c) const; + TQByteArray encodedData(const char* c) const; Node const* getItem() const; static bool canDecode(TQMimeSource*); diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index 52195d83..af44e908 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -18,9 +18,9 @@ #include <tqfile.h> #include <tqpainter.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmainwindow.h> #include <tqtimer.h> #include <tqtooltip.h> diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index 17c25ddf..3f3e3c83 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -113,7 +113,7 @@ public: /** --------------- DOM::Node modifications -------------------------- */ /** - * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check + * It will move DOM::Nodes from startNode to endNode as children of newParent. It does NOT check * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports(). * @param newParent The new parent of the DOM::Nodes. * @param startNode The first node to move. diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui index 509ab551..d82aa14f 100644 --- a/quanta/parts/kafka/kafkasyncoptionsui.ui +++ b/quanta/parts/kafka/kafkasyncoptionsui.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>31</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>31</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>167</height> diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index 1e177b0c..d21129cd 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -51,7 +51,7 @@ NodeModif::NodeModif() m_type = -1; m_node = 0L; m_tag = 0L; - m_tqchildrenMovedUp = 0; + m_childrenMovedUp = 0; m_neighboursMovedDown = 0; } @@ -1477,7 +1477,7 @@ void undoRedo::debugOutput() " - contents: " << (*it2)->tag()->tagStr() << endl; if(((*it2)->type() == NodeModif::NodeRemoved && !afterEditorIt) || ((*it2)->type() == NodeModif::NodeAdded && afterEditorIt)) - kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->tqchildrenMovedUp() << + kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->childrenMovedUp() << " - ChildsNumber2 : " << (*it2)->neighboursMovedDown() << endl; } kdDebug(24000)<< "== End Node Modifications set #" << i << endl; diff --git a/quanta/parts/kafka/undoredo.h b/quanta/parts/kafka/undoredo.h index 6280a67f..6464c46d 100644 --- a/quanta/parts/kafka/undoredo.h +++ b/quanta/parts/kafka/undoredo.h @@ -95,17 +95,17 @@ public: /** * TODO:REMOVE - * For non-XmlEnd Node deletion without its tqchildren. - * @param tqchildrenNumber The number of tqchildren which are moved up + * For non-XmlEnd Node deletion without its children. + * @param childrenNumber The number of children which are moved up * at the location where was the deleted Node. */ - void setChildrenMovedUp(int tqchildrenNumber) {m_tqchildrenMovedUp = tqchildrenNumber;} + void setChildrenMovedUp(int childrenNumber) {m_childrenMovedUp = childrenNumber;} /** * TODO:REMOVE * @return Returns the number of childs which were moved up. */ - int tqchildrenMovedUp() {return m_tqchildrenMovedUp;} + int childrenMovedUp() {return m_childrenMovedUp;} /** * TODO:REMOVE @@ -139,7 +139,7 @@ public: NodeTreeRemoved, //Moving a Node from one location to another. Implemented. NodeMoved, - //Moving a Node and its tqchildren from one location to another. + //Moving a Node and its children from one location to another. NodeAndChildsMoved }; @@ -148,7 +148,7 @@ private: TQValueList<int> m_location, m_finalLocation; Node *m_node; Tag *m_tag; - int m_tqchildrenMovedUp; + int m_childrenMovedUp; int m_neighboursMovedDown; }; diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index f51327a7..ee56255d 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -34,9 +34,9 @@ #include <tqregexp.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatetime.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqptrvector.h> #include "document.h" @@ -2328,7 +2328,7 @@ void KafkaDocument::slotCut(Node* startNode, int startOffset, Node* endNode, int drag_object->addDragObject(node_drag); drag_object->addDragObject(text_drag); - TQApplication::tqclipboard()->setData(drag_object); + TQApplication::clipboard()->setData(drag_object); #ifdef LIGHT_DEBUG kafkaCommon::coutTree(subtree_root, 3); #endif @@ -2365,7 +2365,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in drag_object->addDragObject(node_drag); drag_object->addDragObject(text_drag); - TQApplication::tqclipboard()->setData(drag_object); + TQApplication::clipboard()->setData(drag_object); // FIXME delete the subtree #ifdef LIGHT_DEBUG kafkaCommon::coutTree(subtree_root, 3); @@ -2375,7 +2375,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in void KafkaDocument::slotPaste() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQMimeSource* e = cb->data(); Node* node = new Node(0); diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 0e91fce0..a293cabe 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -17,7 +17,7 @@ //qt includes #include <tqfileinfo.h> -#include <tqtextcodec.h> +#include <textcodec.h> //kde includes #include <kconfig.h> @@ -103,7 +103,7 @@ void WHTMLPart::forward() hpos++; openURL( KURL( history.at(hpos) ) ); - emit updatetqStatus( backEnable() , forwardEnable() ); + emit updateStatus( backEnable() , forwardEnable() ); } } @@ -115,7 +115,7 @@ void WHTMLPart::back() hpos--; openURL(KURL(history.at(hpos))); - emit updatetqStatus(backEnable(), forwardEnable()); + emit updateStatus(backEnable(), forwardEnable()); } } @@ -133,7 +133,7 @@ void WHTMLPart::addToHistory(const TQString &url) hpos = history.count()-1; - emit updatetqStatus( backEnable() , forwardEnable() ); + emit updateStatus( backEnable() , forwardEnable() ); } diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 2ec05dfe..bcf0af53 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -54,7 +54,7 @@ public slots: virtual bool eventFilter(TQObject *watched, TQEvent *e); signals: - void updatetqStatus( bool back, bool forward ); + void updateStatus( bool back, bool forward ); void previewHasFocus(bool focus); void showPreview(bool show); void openFile(const KURL&, const TQString&, bool); diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui index 17f1d8f0..a82e6806 100644 --- a/quanta/plugins/pluginconfig.ui +++ b/quanta/plugins/pluginconfig.ui @@ -23,7 +23,7 @@ <height>281</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>560</width> <height>280</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>247</width> <height>20</height> @@ -117,13 +117,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>48</width> <height>48</height> @@ -190,7 +190,7 @@ <property name="name"> <cstring>locationButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>28</width> <height>32767</height> diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui index d464cadb..f50908ab 100644 --- a/quanta/plugins/plugineditor.ui +++ b/quanta/plugins/plugineditor.ui @@ -22,7 +22,7 @@ <height>306</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>224</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>67</height> diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index dab6dbd0..b6bd4e3e 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -119,7 +119,7 @@ bool QuantaPlugin::load() m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); if(!m_part) { - KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").tqarg(m_name).tqarg(m_name).tqarg(m_fileName)); + KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName)); delete m_targetWidget; m_targetWidget = 0L; return false; diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 68d276bb..098c7828 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -90,7 +90,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile) if (pluginType == "Command Line") { emit hideSplash(); - KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").tqarg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); + KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").arg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); continue; } @@ -257,7 +257,7 @@ void QuantaPluginInterface::slotPluginsValidate() { invalidNames += "<br>" + invalidPlugins[i]->name(); } - int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").tqarg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); + int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").arg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); if(answer == KMessageBox::Yes) { slotPluginsEdit(); diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 3c4e0024..29d23964 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent() { TQListViewItem *item = eventsListView->currentItem(); if (!item) return; - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 98aadf20..82dbc51c 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>172</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index d93b1336..ac6efe68 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>0</height> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index ebc16264..3bee7146 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -24,7 +24,7 @@ // include QT files #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // include files for KDE #include <kactionclasses.h> @@ -109,7 +109,7 @@ KURL::List Project::files() return list; } -void Project::insertFile(const KURL& nameURL, bool tqrepaint ) +void Project::insertFile(const KURL& nameURL, bool repaint ) { if (d->excludeRx.exactMatch(nameURL.path())) return; @@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint ) if ( !d->baseURL.isParentOf(url) ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -150,19 +150,19 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint ) d->dom.firstChild().firstChild().appendChild( el ); KURL u = url.upURL(); ProjectURL *parentURL = d->m_projectFiles.find(u); - int uploadtqStatus = 1; + int uploadStatus = 1; if (parentURL) - uploadtqStatus = parentURL->uploadtqStatus; - d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) ); + uploadStatus = parentURL->uploadStatus; + d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) ); } url.setPath(url.directory(false)); } emit eventHappened("after_project_add", url.url(), TQString()); setModified(); - if ( tqrepaint ) + if ( repaint ) { emit reloadTree( &(d->m_projectFiles), false, TQStringList()); - emit newtqStatus(); + emit newStatus(); } } @@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload) { KURL tempURL = KURL().fromPathOrURL(tempPath); if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && - KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) + KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { d->m_tmpProjectFile = tempPath; @@ -262,7 +262,7 @@ void Project::slotOpenProject(const KURL &url) { emit hideSplash(); if (KMessageBox::questionYesNo(d->m_mainWindow, - i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) + i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes) { d->m_projectRecent->removeURL(url); @@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) if (showDlg) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); destination = urlRequesterDlg->selectedURL(); @@ -384,7 +384,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) setModified(); // there happens more than setting the flag ! emit reloadTree(&(d->m_projectFiles), false, TQStringList()); - emit newtqStatus(); + emit newStatus(); } @@ -422,12 +422,12 @@ void Project::slotRemove(const KURL& urlToRemove) if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree( &(d->m_projectFiles), false, TQStringList() ); - emit newtqStatus(); + emit newStatus(); TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); TQString nice = urlPath; nice = KStringHandler::lsqueeze(nice, 60); - if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) + if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) { TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles"); TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile"); @@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) { if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr) { - it.current()->uploadtqStatus = status; + it.current()->uploadStatus = status; el = it.current()->domElement; el.setAttribute("uploadstatus", status); } @@ -960,7 +960,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) setModified(); } -void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status) +void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status) { ProjectURL *proUrl = d->m_projectFiles.find(url); if (! proUrl) @@ -1280,7 +1280,7 @@ bool Project::queryClose() reloadTree( &(d->m_projectFiles), true, TQStringList()); d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); - newtqStatus(); + newStatus(); // kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } @@ -1345,7 +1345,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { KTextEditor::Mark *mark = marks.at(i); if (mark->type == KTextEditor::MarkInterface::Bookmark) - markList << TQString("%1").tqarg(mark->line); + markList << TQString("%1").arg(mark->line); } TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; diff --git a/quanta/project/project.h b/quanta/project/project.h index 8c25ccf9..fc88c13b 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -79,7 +79,7 @@ public: TQStringList fileNameList(); KURL::List files(); - void insertFile( const KURL& nameURL, bool tqrepaint ); + void insertFile( const KURL& nameURL, bool repaint ); void readConfig(KConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash @@ -174,7 +174,7 @@ public slots: void slotRescanPrjDir(); void slotFileDescChanged(const KURL& url, const TQString& desc); void slotUploadStatusChanged(const KURL& url, int status); - void slotChangeDocumentFoldertqStatus(const KURL& url, bool status); + void slotChangeDocumentFolderStatus(const KURL& url, bool status); void slotReloadProjectDocs(); @@ -194,7 +194,7 @@ signals: void messages(const TQString& ); void enableMessageWidget(); - void newtqStatus(); + void newStatus(); void statusMsg(const TQString &); /** No descriptions */ void newProjectLoaded(const TQString &, const KURL &, const KURL &); @@ -204,7 +204,7 @@ signals: void getUserToolbarFiles(KURL::List *); void loadToolbarFile(const KURL &); /** ask for the tree status for saving in project */ - void getTreetqStatus(TQStringList *); + void getTreeStatus(TQStringList *); void eventHappened(const TQString&, const TQString&, const TQString& ); private: diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp index ec46ecb9..d0e5b942 100644 --- a/quanta/project/projectlist.cpp +++ b/quanta/project/projectlist.cpp @@ -80,8 +80,8 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } else { bool docFolder = (el.attribute("documentFolder", "false") == "true"); - int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt(); - if (uploadtqStatus == -1) + int uploadStatus = el.attribute("uploadstatus", "-1").toInt(); + if (uploadStatus == -1) el.setAttribute("uploadstatus", 1); //remove non-existent local files if ( url.isLocalFile() ) diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index 05dd7cf4..1821429c 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -17,7 +17,7 @@ // qt includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // kde includes #include <kiconloader.h> @@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){ void ProjectNewFinal::setMargin(int i) { - tqlayout()->setMargin(i); + layout()->setMargin(i); } diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui index 136245bb..fc3603c9 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -29,13 +29,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32000</width> <height>32000</height> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>115</width> <height>480</height> @@ -79,7 +79,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -104,7 +104,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -141,7 +141,7 @@ <property name="name"> <cstring>TextLabel3_2_3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,7 +160,7 @@ <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 8869cbdc..be93eb3d 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -19,7 +19,7 @@ #include <tqdir.h> #include <tqevent.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type() void ProjectNewGeneral::setMargin(int i) { - tqlayout()->setMargin(i); + layout()->setMargin(i); } void ProjectNewGeneral::slotButtonTmpl() @@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl() linePrjTmpl->setText(KURL::relativeURL(baseUrl, url)); } else { - KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar() } { KMessageBox::sorry(0, i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>") - .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -225,7 +225,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) url = QExtFileInfo::toAbsolute(url, baseUrl); if (!baseUrl.isParentOf(url)) { - KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjTmpl->setFocus(); emit enableNextButton(this, false); } else @@ -239,7 +239,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) if (!baseUrl.isParentOf(url)) { KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>") - .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjToolbar->setFocus(); emit enableNextButton(this, false); } else diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index 8176cb04..b58173eb 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -32,13 +32,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32000</width> <height>32000</height> @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>115</width> <height>480</height> @@ -82,7 +82,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -107,7 +107,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -141,13 +141,13 @@ <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -174,13 +174,13 @@ <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -277,7 +277,7 @@ <property name="text"> <string>File:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -307,7 +307,7 @@ <property name="text"> <string>Protocol: </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="hAlign" stdset="0"> @@ -320,7 +320,7 @@ <property name="text"> <string>Password:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -359,7 +359,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>26</height> @@ -381,7 +381,7 @@ <property name="text"> <string>Port:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -397,7 +397,7 @@ <property name="text"> <string>Host:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1883c03a..fb67e4fb 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL) { baseURL = a_baseURL; baseURL.adjustPath(1); - checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol))); + checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol))); listView->clear(); fileList.clear(); checkInsert->setChecked(false); @@ -254,7 +254,7 @@ void ProjectNewLocal::slotAddFolder() { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index 5b737924..a23e8de7 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -29,13 +29,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32000</width> <height>32000</height> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>115</width> <height>480</height> @@ -85,7 +85,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -93,7 +93,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -184,7 +184,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -205,7 +205,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>85</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>89</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index 4711434a..df0d8539 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -29,13 +29,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32000</width> <height>32000</height> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>115</width> <height>480</height> @@ -79,7 +79,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -87,7 +87,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>309</width> <height>16</height> @@ -178,7 +178,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -202,7 +202,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>228</width> <height>20</height> diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 9a577bdd..5d2e8cc8 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -40,13 +40,13 @@ <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -60,13 +60,13 @@ <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -88,7 +88,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -302,7 +302,7 @@ <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 52879849..ce3686bf 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -351,7 +351,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) progressBar->setTextEnabled(false); parent->reloadTree(&(m_projectFiles), false, TQStringList()); - parent->newtqStatus(); + parent->newStatus(); parent->statusMsg(TQString()); } @@ -699,7 +699,7 @@ void ProjectPrivate::loadProjectXML() parent->statusMsg(TQString()); parent->newProjectLoaded(projectName, baseURL, templateURL); parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); - parent->newtqStatus(); + parent->newStatus(); adjustActions(); } @@ -917,7 +917,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) { if (!askForName || KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>") - .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) + .arg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) { node.parentNode().removeChild(node); break; @@ -1056,7 +1056,7 @@ bool ProjectPrivate::createEmptyDom() if (!result) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; delete sessionTempFile; @@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree() i--; } TQStringList folderList; - parent->getTreetqStatus( &folderList ); + parent->getTreeStatus( &folderList ); // toplevel folder is always open in a project and QExtFileInfo::toRelative // creates strange output -> we remove the toplevel folder if (folderList.count() > 0) @@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject() { TQWizard *wiz = new TQWizard(m_mainWindow, "new", true); wiz->setCaption(i18n("New Project Wizard")); - wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); png = new ProjectNewGeneral(0L); @@ -1197,7 +1197,7 @@ void ProjectPrivate::slotNewProject() delete wiz; adjustActions(); - parent->newtqStatus(); + parent->newStatus(); } /** close project and edited files */ @@ -1230,8 +1230,8 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success) parent->reloadTree( &(m_projectFiles), true, TQStringList()); adjustActions(); m_projectRecent->setCurrentItem(-1); - parent->newtqStatus(); - kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + parent->newStatus(); + kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } @@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); + parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile)); } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile)); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").arg(m_tmpProjectFile)); result = false; } return result; @@ -1339,7 +1339,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile)); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").arg(tempFile)); } } @@ -1351,13 +1351,13 @@ bool ProjectPrivate::loadProject(const KURL &url) if (!url.isValid()) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL())); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").arg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { parent->hideSplash(); - if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").arg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } TQString projectTmpFile; @@ -1416,7 +1416,7 @@ bool ProjectPrivate::loadProject(const KURL &url) } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } return true; @@ -1532,7 +1532,7 @@ void ProjectPrivate::slotDebuggerOptions() else { parent->hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } } @@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile() { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); + parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index ba267753..fb439707 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -211,15 +211,15 @@ void ProjectUpload::slotBuildTree() uploadedTime = m_uploadTimeList[s]; int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); - int uploadtqStatus = el.attribute("uploadstatus", "1").toInt(); - if (m_quickUpload || (forceUpload && uploadtqStatus == 0)) - uploadtqStatus = 1; - if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0)) + int uploadStatus = el.attribute("uploadstatus", "1").toInt(); + if (m_quickUpload || (forceUpload && uploadStatus == 0)) + uploadStatus = 1; + if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0)) { modified.append( u ); it->setSelected(true); } - if (uploadtqStatus == 2) + if (uploadStatus == 2) it->setConfirmUpload(true); totalProgress->setValue(i); } @@ -382,7 +382,7 @@ void ProjectUpload::startUpload() } else { if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>") - .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) + .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) { upload(); return; @@ -463,7 +463,7 @@ void ProjectUpload::upload() connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); - labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName())); + labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); return; } else //it is a dir, so just go to the next item @@ -517,7 +517,7 @@ void ProjectUpload::selectModified() { TQListViewItem *it = list->findItem( (*file).path() ); it->setSelected(true); - it->tqrepaint(); + it->repaint(); } list->checkboxTree(); } @@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext() UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it); if (itf) itf->setWhichPixmap( "check_clear" ); - it->tqrepaint(); + it->repaint(); } toUpload.remove( it ); @@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile() } else { TQString profileName = comboProfile->currentText(); - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").tqarg(profileName), + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(profileName), i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue) { m_profilesNode.removeChild(m_currentProfileElement); @@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile() slotNewProfileSelected(currentProfile); if (profileName == defaultProfile()) { - KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").tqarg(currentProfile), i18n("Profile Removal")); + KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").arg(currentProfile), i18n("Profile Removal")); m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile); } comboProfile->removeItem(idx); diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 3bc4e83a..42b79257 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -30,7 +30,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>20</height> @@ -338,7 +338,7 @@ <property name="text"> <string>Current: [none]</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h index 02232234..cf3eae66 100644 --- a/quanta/project/projecturl.h +++ b/quanta/project/projecturl.h @@ -32,26 +32,26 @@ class ProjectURL : public KURL { public: TQString fileDesc; - int uploadtqStatus; ///< The upload state, see UploadtqStatus + int uploadStatus; ///< The upload state, see UploadStatus bool documentFolder; TQDomElement domElement; ProjectURL() - : KURL(), uploadtqStatus(1), documentFolder(false) {} + : KURL(), uploadStatus(1), documentFolder(false) {} ProjectURL(const KURL& url) - : KURL(url), uploadtqStatus(1), documentFolder(false) {} + : KURL(url), uploadStatus(1), documentFolder(false) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder) - : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {} + : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el) - : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {} + : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {} virtual ~ProjectURL() {} /** The default state for a file when uploading */ - enum UploadtqStatus + enum UploadStatus { NeverUpload = 0, ///< the files is not selected for upload, even if it was modified AlwaysUpload, ///< the file is automatically selected for upload if it was modified diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 9904cdf2..1d628667 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -18,7 +18,7 @@ // qt includes #include <tqlistview.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> // kde includes @@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t ) { RescanPrjDir::resizeEvent(t); // listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20); -// MainLayout->setGeometry(tqchildrenRect()); +// MainLayout->setGeometry(childrenRect()); } void RescanPrj::slotSelect() @@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *) if (m_listJobCount == 0) { progressText->setText(i18n("Building tree:")); - progressText->tqrepaint(); + progressText->repaint(); progress->setTotalSteps(urlList.count()); progress->setValue(0); URLListEntry urlEntry; diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index 019f40a7..8fb4b774 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>620</width> <height>540</height> @@ -83,13 +83,13 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>4</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>4</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>144</height> diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index 6d4ffa69..da902bf1 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember() if (deleteYourself) { - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; setYourself(""); } } else - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } @@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject) ) ) { - if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").arg(role).arg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) { it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8())); return true; @@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, } else if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name)) { - KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL))); + KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL))); return false; } ++it; diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index eba26cf6..847c8b04 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -52,7 +52,7 @@ <property name="text"> <string>Please select your identity from the member list.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index 40fbd905..de6521e6 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -122,7 +122,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>445</width> <height>20</height> @@ -263,7 +263,7 @@ is obscured, saving the password in any file is a security risk. Use this option <property name="text"> <string>&Protocol:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index 466dbc27..a5a87110 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 3903e794..f8002c6a 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -1010,7 +1010,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="913" type="bool" abstract="0" documentation="" name="hasProject" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="914" type="void" abstract="0" documentation="" name="insertFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="915" value="" type="const KURL &" abstract="0" documentation="" name="nameURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="tqrepaint" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="repaint" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="917" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="918" value="" type="KURL :: List" abstract="0" documentation="" name="files" static="0" scope="200" /> diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr index 07d72ddd..c6e1f98e 100755 --- a/quanta/scripts/checkxml.kmdr +++ b/quanta/scripts/checkxml.kmdr @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -207,7 +207,7 @@ checkXML index.docbook 2>&1</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -237,7 +237,7 @@ checkXML index.docbook 2>&1</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>89</width> <height>0</height> diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr index b3ac688e..48403654 100755 --- a/quanta/scripts/docbook_table.kmdr +++ b/quanta/scripts/docbook_table.kmdr @@ -40,7 +40,7 @@ <property name="text"> <string>DocBook Table</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr index 7a9b3ff6..ec4b5ff5 100755 --- a/quanta/scripts/dwt.kmdr +++ b/quanta/scripts/dwt.kmdr @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>80</height> @@ -162,7 +162,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>225</width> <height>0</height> diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr index 73047ad1..ace8e554 100755 --- a/quanta/scripts/gubed_install.kmdr +++ b/quanta/scripts/gubed_install.kmdr @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>332</width> <height>0</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>175</height> diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr index fb7b4336..402d6f0e 100755 --- a/quanta/scripts/htmlquickstart.kmdr +++ b/quanta/scripts/htmlquickstart.kmdr @@ -75,7 +75,7 @@ fi <property name="text"> <string>Quanta Plus Kommander Quick Start</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -89,7 +89,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>33</width> <height>0</height> @@ -108,7 +108,7 @@ fi <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr index ad0673cc..6333c60d 100755 --- a/quanta/scripts/listwizard.kmdr +++ b/quanta/scripts/listwizard.kmdr @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>296</width> <height>0</height> @@ -217,7 +217,7 @@ Select the list type: </ul> </qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr index 9b564df2..66f30040 100755 --- a/quanta/scripts/meinproc.kmdr +++ b/quanta/scripts/meinproc.kmdr @@ -95,7 +95,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>292</width> <height>0</height> @@ -172,7 +172,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -216,7 +216,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr index ff48ed9e..1b965193 100755 --- a/quanta/scripts/picturewizard.kmdr +++ b/quanta/scripts/picturewizard.kmdr @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>0</height> @@ -143,7 +143,7 @@ Select the type of markup appropriated to wrap your image: </ul> </qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr index b0176e88..ec002775 100755 --- a/quanta/scripts/tablewizard.kmdr +++ b/quanta/scripts/tablewizard.kmdr @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>0</height> @@ -408,7 +408,7 @@ Select the table type: </ul> </qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr index 6bea7b90..472750ab 100755 --- a/quanta/scripts/tidy.kmdr +++ b/quanta/scripts/tidy.kmdr @@ -985,7 +985,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>0</height> @@ -1002,7 +1002,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>0</height> @@ -1019,7 +1019,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>125</width> <height>0</height> diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr index b9eb408d..494ca294 100755 --- a/quanta/scripts/xmlval.kmdr +++ b/quanta/scripts/xmlval.kmdr @@ -121,7 +121,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -165,7 +165,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -219,7 +219,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -343,7 +343,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -384,7 +384,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -448,7 +448,7 @@ xmllint $CMDLINE 2>&1 <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>228</width> <height>0</height> diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr index 2f5ee689..3d2227eb 100755 --- a/quanta/scripts/xsltproc.kmdr +++ b/quanta/scripts/xsltproc.kmdr @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 0f0d9933..68fe11e9 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -26,8 +26,8 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqlineedit.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> +#include <textcodec.h> +#include <textstream.h> #include <tqregexp.h> #include <tqradiobutton.h> @@ -409,7 +409,7 @@ void Document::insertFile(const KURL& url) { if (!KIO::NetAccess::download(url, fileName, this)) { - KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").tqarg( url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( url.prettyURL(0, KURL::StripFileProtocol))); return; } } @@ -421,7 +421,7 @@ void Document::insertFile(const KURL& url) insertText(stream.read()); file.close(); } else - KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); } /** Inserts text at the current cursor position */ @@ -858,7 +858,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri { m_replaceLine = line; m_replaceCol = column; - m_replaceStr = QuantaCommon::encodedChar(string[0].tqunicode()); + m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); return; } @@ -866,7 +866,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri } if (qConfig.replaceAccented) { - uint c = string[0].tqunicode(); + uint c = string[0].unicode(); if (c > 191) { m_replaceLine = line; @@ -1303,7 +1303,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, { if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName))) { - tagName = tag->name() + TQString("%1").tqarg(i, 10); + tagName = tag->name() + TQString("%1").arg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); i++; @@ -1319,7 +1319,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, if ((tag->className == classStr || isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word)) { - tagName = tag->name() + TQString("%1").tqarg(i, 10); + tagName = tag->name() + TQString("%1").arg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); @@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted() } /** Ask for user confirmation if the file was changed outside. */ -void Document::checkDirtytqStatus() +void Document::checkDirtyStatus() { TQString fileName; if (url().isLocalFile()) @@ -2576,9 +2576,9 @@ bool Document::hasChanged() return b; } -void Document::setChanged(bool newtqStatus) +void Document::setChanged(bool newStatus) { - changed = newtqStatus; + changed = newStatus; } void Document::paste() @@ -2614,7 +2614,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo TQString s = text(bl, bc, el, ec); if (includeCoordinates) { - s.prepend(TQString("%1,%2,%3,%4\n").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec)); + s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec)); } result += s; if (skipFoundContent) @@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType) if (!isUntitled()) { - quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol))); + quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(url().prettyURL(0, KURL::StripFileProtocol))); } quantaApp->slotLoadToolbarForDTD(dtdName); StructTreeView::ref()->useOpenLevelSetting = true; @@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName) { if ( url().path() == fileName && !dirty() ) { - setDirtytqStatus(true); + setDirtyStatus(true); if (this == ViewManager::ref()->activeDocument()) { - checkDirtytqStatus(); + checkDirtyStatus(); } } } diff --git a/quanta/src/document.h b/quanta/src/document.h index ff76fbb3..a7fda743 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -143,9 +143,9 @@ work correctly. */ void codeCompletionHintRequested(); /** Returns the dirty status. */ bool dirty() const {return m_dirty;}; - void setDirtytqStatus(bool status) {m_dirty = status;}; + void setDirtyStatus(bool status) {m_dirty = status;}; /** Ask for user confirmation if the file was changed outside. */ - void checkDirtytqStatus(); + void checkDirtyStatus(); /** Save the document and reset the dirty status. */ void save(); /** Save the document under a new name and calculate the new md5sum. */ @@ -159,7 +159,7 @@ work correctly. */ /** Returns the changed status since the last query. Resets changed.*/ bool hasChanged(); /** Sets the changed status.*/ - void setChanged(bool newtqStatus); + void setChanged(bool newStatus); /** Paste the contents of clipboard into the document */ void paste(); @@ -170,7 +170,7 @@ work correctly. */ /** returns all the areas that are between tag and it's closing pair */ TQStringList tagAreas(const TQString &tag, bool includeCoordinates, bool skipFoundContent); - /** disable/enable the tqrepaint of the Kate view */ + /** disable/enable the repaint of the Kate view */ void activateRepaintView(bool activation); bool RepaintViewActivated() {return repaintEnabled;} diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 7a6538f6..c378bd05 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -272,10 +272,10 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString dirName = dirURL.path(1); if (TQFile::exists(dirName + "common.tag")) readTagFile(dirName + "common.tag", dtd, 0L); - //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false); + //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false); emit enableIdleTimer(false); KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L); - //quantaApp->slotEnableIdleTimer(idleTimertqStatus); + //quantaApp->slotEnableIdleTimer(idleTimerStatus); emit enableIdleTimer(true); TQString tmpStr; KURL::List::ConstIterator end_f = files.constEnd(); @@ -533,7 +533,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagStr; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); //new code group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); @@ -583,7 +583,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagName; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace(); @@ -685,7 +685,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList if (!m_doc->setContent( &f, &errorMsg, &errorLine, &errorCol )) { emit hideSplash(); - KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(errorCol), + KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").arg(fileName).arg(errorMsg).arg(errorLine).arg(errorCol), i18n("Invalid Tag File")); kdWarning() << fileName << ": " << errorMsg << ": " << errorLine << "," << errorCol << endl; } @@ -794,7 +794,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common) for ( TQDomNode n = dom->firstChild(); !n.isNull(); n = n.nextSibling() ) { tmpStr = n.nodeName(); - if (tmpStr == "tqchildren") + if (tmpStr == "children") { TQDomElement el = n.toElement(); TQDomElement item = el.firstChild().toElement(); @@ -914,7 +914,7 @@ void DTDs::slotLoadDTD() TQString nickName = dtdcfg.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->find(dtdName) ; if (dtd && - KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } @@ -924,7 +924,7 @@ void DTDs::slotLoadDTD() TQString family = dtdcfg.readEntry("Family", "1"); Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); @@ -946,18 +946,18 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) TQString nickName = dtdcfg.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->find(dtdName) ; if ( dtd && - KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } removeDTD(dtd); if (!readTagDir(dirName)) { - KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").tqarg(dirName), i18n("Error Loading DTEP")); + KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").arg(dirName), i18n("Error Loading DTEP")); } else { TQString family = dtdcfg.readEntry("Family", "1"); - if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").tqarg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) + if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").arg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) { KURL src; src.setPath(dirName); @@ -968,7 +968,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) } Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 212bc68f..b39b0c46 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -80,12 +80,12 @@ KQApplication::KQApplication() KConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); - TQString tqlayout = config->readEntry("Window tqlayout", "Default"); - if (tqlayout == "Default" || args->isSet("resettqlayout")) + TQString layout = config->readEntry("Window layout", "Default"); + if (layout == "Default" || args->isSet("resetlayout")) { mdiMode = KMdi::IDEAlMode; config->writeEntry("MDI mode", KMdi::IDEAlMode); - config->writeEntry("Window tqlayout", "Default"); + config->writeEntry("Window layout", "Default"); } quantaApp = new QuantaApp(mdiMode); config->setGroup("General Options"); @@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance() KConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); - TQString tqlayout = config->readEntry("Window tqlayout", "Default"); - if (tqlayout == "Default" || args->isSet("resettqlayout")) + TQString layout = config->readEntry("Window layout", "Default"); + if (layout == "Default" || args->isSet("resetlayout")) { mdiMode = KMdi::IDEAlMode; - config->writeEntry("Window tqlayout", "Default"); + config->writeEntry("Window layout", "Default"); config->writeEntry("MDI mode", KMdi::IDEAlMode); } quantaApp = new QuantaApp(mdiMode); diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp index 75d6918e..3e11bacb 100644 --- a/quanta/src/main.cpp +++ b/quanta/src/main.cpp @@ -56,7 +56,7 @@ static KCmdLineOptions options[] = { "+[File]", I18N_NOOP("File to open"), 0 }, { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 }, { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 }, - { "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0}, + { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0}, KCmdLineLastOption // INSERT YOUR COMMANDLINE OPTIONS HERE }; diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index ee054cbe..e74240ca 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -32,9 +32,9 @@ #include <tqradiobutton.h> #include <tqimage.h> #include <tqtimer.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> -#include <tqtextedit.h> +#include <textcodec.h> +#include <textstream.h> +#include <textedit.h> #include <tqiodevice.h> #include <tqcombobox.h> #include <tqdockarea.h> @@ -42,7 +42,7 @@ #include <tqspinbox.h> #include <tqeventloop.h> #include <tqfontmetrics.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqptrlist.h> #include <tqbuffer.h> #include <tqdatetime.h> @@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_parserEnabled = true; cursorLine = 0; cursorCol = 0; - emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); setAcceptDrops(true); tabWidget()->installEventFilter(this); } @@ -375,7 +375,7 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding) { if (!QExtFileInfo::exists(*i, true, this)) { - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg((*i).prettyURL(0, KURL::StripFileProtocol))); } else { @@ -412,7 +412,7 @@ void QuantaApp::slotFileOpenRecent(const KURL &url) if (!QExtFileInfo::exists(url, true, this)) { if (KMessageBox::questionYesNo(this, - i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep")) + i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep")) == KMessageBox::Yes) { fileRecent->removeURL(url); @@ -433,7 +433,7 @@ void QuantaApp::slotFileSave() Document *w = view->document(); if (w) { - w->checkDirtytqStatus(); + w->checkDirtyStatus(); if (w->isUntitled()) slotFileSaveAs(); else @@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) if (w) { KURL oldURL = w->url(); - w->checkDirtytqStatus(); + w->checkDirtyStatus(); if (!w->isUntitled() && oldURL.isLocalFile()) { fileWatcher->removeFile(oldURL.path()); @@ -523,7 +523,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) { oldURL = saveUrl; if (Project::ref()->hasProject() && !Project::ref()->contains(saveUrl) && - KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) + KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").arg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) ) { if (saveUrl.isLocalFile()) @@ -557,7 +557,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) KURL url; int query; KURL projectTemplateURL; - w->checkDirtytqStatus(); + w->checkDirtyStatus(); TQString localTemplateDir = locateLocal("data", resourceDir + "templates/"); do { @@ -584,7 +584,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) { if (projectTemplate) localTemplateDir = projectTemplateURL.path(1); - KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").tqarg(localTemplateDir)); + KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(localTemplateDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -603,7 +603,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) tempFile->file()->flush(); tempFile->close(); if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this)) - KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } else { @@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll() part->write(" "); part->end(); - slotNewtqStatus(); + slotNewStatus(); } void QuantaApp::slotFileQuit() @@ -710,12 +710,12 @@ void QuantaApp::slotStatusMsg(const TQString &msg) { statusbarTimer->stop(); statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS); - statusBar()->tqrepaint(); - kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + statusBar()->repaint(); + kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); statusbarTimer->start(10000, true); } -/** tqrepaint preview */ +/** repaint preview */ void QuantaApp::slotRepaintPreview() { Document *w = ViewManager::ref()->activeDocument(); @@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) } } -void QuantaApp::slotNewtqStatus() +void QuantaApp::slotNewStatus() { fileRecent->setEnabled(true); actionCollection()->action("project_open_recent")->setEnabled(true); @@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions() if (previewSettingsChanged) slotShowPreviewWidget(true); qConfig.docPosition = uiOptions->docPosition(); - qConfig.windowLayout = uiOptions->tqlayout(); + qConfig.windowLayout = uiOptions->layout(); m_htmlPart->closeURL(); m_htmlPart->begin( Project::ref()->projectBaseURL()); @@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions() m_htmlPart->end(); reparse(true); - slotNewtqStatus(); + slotNewStatus(); } m_config->sync(); @@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show) } } -void QuantaApp::slotChangePreviewtqStatus() +void QuantaApp::slotChangePreviewStatus() { if (qConfig.previewPosition == "Editor") { @@ -1446,7 +1446,7 @@ void QuantaApp::slotChangePreviewtqStatus() if (m_previewToolView && m_htmlPart->view()->isVisible()) { //hiding the preview when it's in a toolview means that the current tab has changed, - //so we just tqrepaint the content and restore the document on the disc. + //so we just repaint the content and restore the document on the disc. m_previewVisible = true; if (m_previewedDocument) { @@ -1511,7 +1511,7 @@ void QuantaApp::newCursorPosition(const TQString &file, int lineNumber, int colu startIdleTimer(); // updateTreeViews(); TQString linenumber; - linenumber = i18n("Line: %1 Col: %2").tqarg(lineNumber).tqarg(columnNumber); + linenumber = i18n("Line: %1 Col: %2").arg(lineNumber).arg(columnNumber); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); statusBar()->changeItem(i18n(" R/O "),IDS_INS_OVR); statusBar()->changeItem("",IDS_MODIFIED); @@ -1525,7 +1525,7 @@ void QuantaApp::newDebuggerPosition(const TQString &file, int lineNumber) void QuantaApp::openFile(const TQString &file, int lineNumber, int columnNumber) { gotoFileAndLine(file, lineNumber, columnNumber); - slotNewtqStatus(); + slotNewStatus(); } void QuantaApp::slotNewLineColumn() @@ -1539,7 +1539,7 @@ void QuantaApp::slotNewLineColumn() Document *w = ViewManager::ref()->activeDocument(); if (w) w->viewCursorIf->cursorPosition(&cursorLine, &cursorCol); - linenumber = i18n("Line: %1 Col: %2").tqarg(cursorLine+1).tqarg(cursorCol+1); + linenumber = i18n("Line: %1 Col: %2").arg(cursorLine+1).arg(cursorCol+1); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); } @@ -1795,7 +1795,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii()); QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true); tb->loadState(element); - tb->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl; if (toolbarTab->iconText() == KToolBar::IconTextBottom) @@ -1968,7 +1968,7 @@ void QuantaApp::slotContextMenuAboutToShow() urlUnderCursor = baseUrl; QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace()); urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl); - action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); + action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); action->setEnabled(true); } else { @@ -2027,7 +2027,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_addwatch"); if(action) { - action->setText(i18n("Add Watch: '%1'").tqarg(word)); + action->setText(i18n("Add Watch: '%1'").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2038,7 +2038,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_variable_set"); if(action) { - action->setText(i18n("Set Value of '%1'").tqarg(word)); + action->setText(i18n("Set Value of '%1'").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2049,7 +2049,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_conditional_break"); if(action) { - action->setText(i18n("Break When '%1'...").tqarg(word)); + action->setText(i18n("Break When '%1'...").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2087,7 +2087,7 @@ void QuantaApp::slotOpenFileUnderCursor() } } else { - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); } } @@ -2166,8 +2166,8 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) { if ((nodeList.item(i).cloneNode().toElement().attribute("name").lower() ) == name.lower()) { - newName = origName + TQString(" (%1)").tqarg(count); - i18nName = i18n(origName.utf8()) + TQString(" (%1)").tqarg(count); + newName = origName + TQString(" (%1)").arg(count); + i18nName = i18n(origName.utf8()) + TQString(" (%1)").arg(count); nameModified = true; count++; found = true; @@ -2199,7 +2199,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) int n = 1; while (m_toolbarList.find(toolbarId) != 0L) { - toolbarId = s + TQString("%1").tqarg(n); + toolbarId = s + TQString("%1").arg(n); toolbarId.replace(rx, "_"); n++; } @@ -2438,7 +2438,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF TQString error; int el, ec; if (!dom->setContent(s, &error, &el, &ec)) - kdError(24000) << TQString("Error %1 at (%2, %3)").tqarg(error).tqarg(el).tqarg(ec)<<endl; + kdError(24000) << TQString("Error %1 at (%2, %3)").arg(error).arg(el).arg(ec)<<endl; p_toolbar->dom = dom; TQTextStream bufferStr(&buffer); @@ -2461,7 +2461,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this)) { KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>" - "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); + "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); tarFile = KURL(); delete p_toolbar->dom; p_toolbar->dom = oldDom; @@ -2554,7 +2554,7 @@ bool QuantaApp::saveToolbar(bool localToolbar, const TQString& toolbarToSave, co if (!localToolbar) localToolbarsDir = projectToolbarsURL.prettyURL(); KMessageBox::sorry(0,i18n("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>") - .tqarg(localToolbarsDir)); + .arg(localToolbarsDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -2591,7 +2591,7 @@ void QuantaApp::slotSaveProjectToolbar() void QuantaApp::slotAddToolbar() { bool ok; - TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").tqarg(userToolbarsCount), &ok, this); + TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").arg(userToolbarsCount), &ok, this); if (ok) { userToolbarsCount++; @@ -2600,7 +2600,7 @@ void QuantaApp::slotAddToolbar() int n = 1; while (m_toolbarList.find(toolbarId) != 0L) { - toolbarId = name + TQString("%1").tqarg(n); + toolbarId = name + TQString("%1").arg(n); n++; } toolbarId = toolbarId.lower(); @@ -2609,7 +2609,7 @@ void QuantaApp::slotAddToolbar() tempFile->setAutoDelete(true); tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); * (tempFile->textStream()) << TQString("<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n<kpartgui name=\"quanta\" version=\"2\">\n<ToolBar name=\"%1\" tabname=\"%2\" i18ntabname=\"%3\" id=\"%4\">\n<text>%5</text>\n</ToolBar>\n</kpartgui>\n") - .tqarg(name.lower()).tqarg(name).tqarg(name).tqarg(toolbarId).tqarg(name); + .arg(name.lower()).arg(name).arg(name).arg(toolbarId).arg(name); tempFile->close(); ToolbarXMLGUI * toolbarGUI = new ToolbarXMLGUI(tempFile->name()); @@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e) if (w) { w->view()->setFocus(); - w->checkDirtytqStatus(); + w->checkDirtyStatus(); } } @@ -3318,12 +3318,12 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) int result; if (p_toolbar->url.isEmpty()) { - result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name), + result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name), i18n("Save Toolbar"), KStdGuiItem::save(), KStdGuiItem::discard()); } else { FourButtonMessageBox dlg(this, 0, true); - dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name)); + dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name)); dlg.setCaption(i18n("Save Toolbar")); dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium)); dlg.exec(); @@ -3784,7 +3784,7 @@ TQStringList QuantaApp::openedURLs() const Document *w = qView->document(); if ( w ) { - list.prepend( TQString("%1:%2").tqarg(w->editIf->editInterfaceNumber()).tqarg(w->url().url())); + list.prepend( TQString("%1:%2").arg(w->editIf->editInterfaceNumber()).arg(w->url().url())); } } } @@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose() { saveOptions(); // kdDebug(24000) << "Quanta will exit" << endl; - emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); } else slotFileNew(); return canExit; @@ -4200,7 +4200,7 @@ void QuantaApp::saveOptions() m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion); - m_config->writeEntry("Window tqlayout", qConfig.windowLayout); + m_config->writeEntry("Window layout", qConfig.windowLayout); m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() ); //If user choose the timer interval, it needs to restart the timer too m_config->writeEntry("Autosave interval", qConfig.autosaveInterval); @@ -4327,7 +4327,7 @@ void QuantaApp::slotEditCurrentTag() slotEnableIdleTimer(true); if (isUnknown) { - TQString message = i18n("Unknown tag: %1").tqarg(tagName); + TQString message = i18n("Unknown tag: %1").arg(tagName); slotStatusMsg( message ); } } @@ -4840,7 +4840,7 @@ void QuantaApp::slotPasteHTMLQuoted() Document *w = ViewManager::ref()->activeDocument(); if (w) { - TQClipboard *cb = tqApp->tqclipboard(); + TQClipboard *cb = tqApp->clipboard(); TQString text = cb->text(); if ( ( !text.isNull() ) && (!text.isEmpty() ) ) @@ -4869,7 +4869,7 @@ void QuantaApp::slotPasteHTMLQuoted() int code = s.toInt(&ok); if (!ok || code < 191) continue; - text.replace(TQChar(code), TQString("&#%1;").tqarg(s)); + text.replace(TQChar(code), TQString("&#%1;").arg(s)); } } unsigned int line, col; @@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded() Document *w = ViewManager::ref()->activeDocument(); if (w) { - TQClipboard *cb = tqApp->tqclipboard(); + TQClipboard *cb = tqApp->clipboard(); TQString text = cb->text(); if ( ( !text.isNull() ) && (!text.isEmpty() ) ) @@ -5004,14 +5004,14 @@ void QuantaApp::slotCopy() if (m_htmlPart->view()->hasFocus()) { TQString selection = m_htmlPart->selectedText(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(selection, TQClipboard::Clipboard); } else if (m_htmlPartDoc->view()->hasFocus()) { TQString selection = m_htmlPartDoc->selectedText(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(selection, TQClipboard::Clipboard); } diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 1b7231e4..d0216e17 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -282,11 +282,11 @@ public slots: unexpected things may happen. */ void slotStatusMsg(const TQString &text); - void slotNewtqStatus(); + void slotNewStatus(); void slotNewLineColumn(); -// void slotUpdatetqStatus(TQWidget*);FIXME: +// void slotUpdateStatus(TQWidget*);FIXME: - /** tqrepaint preview */ + /** repaint preview */ void slotRepaintPreview(); /** toggles showing the preview */ void slotToggleShowPreview(); @@ -298,7 +298,7 @@ public slots: - hide if the preview was in the editor area - update if the preview is in a toolview */ - void slotChangePreviewtqStatus(); + void slotChangePreviewStatus(); /** Called when the preview widget got or lost the focus */ void slotPreviewHasFocus(bool focus); diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 5239c8de..24663af3 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -22,13 +22,13 @@ #include <tqpainter.h> #include <tqtabwidget.h> #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqeventloop.h> #include <tqtimer.h> #include <tqdom.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqpopupmenu.h> #include <tqdatetime.h> #include <tqradiobutton.h> @@ -191,13 +191,13 @@ void QuantaInit::initQuanta() m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom); m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom); - // Restore the dock tqlayout + // Restore the dock layout m_config->setGroup ("General Options"); - TQString tqlayout = m_config->readEntry("Window tqlayout", "Default"); + TQString layout = m_config->readEntry("Window layout", "Default"); int mdiMode = m_config->readNumEntry("MDI mode", -1); - if (mdiMode != -1 && tqlayout != "Default") + if (mdiMode != -1 && layout != "Default") { - m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout... + m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout... if (mdiMode != KMdi::IDEAlMode) m_quanta->setToolviewStyle(qConfig.toolviewTabs); } @@ -268,7 +268,7 @@ void QuantaInit::initQuanta() TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); - m_quanta->slotNewtqStatus(); + m_quanta->slotNewStatus(); initToolBars(); Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown()); Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject()); @@ -301,7 +301,7 @@ void QuantaInit::initQuanta() continue; int length = s.find(";)") - begin + 1; TQString s2 = s.mid(begin, length - 1); - replacementMap[s[0].tqunicode()] = s2; + replacementMap[s[0].unicode()] = s2; } file.close(); } @@ -356,16 +356,16 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus())); + connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *))); + connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), + pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &))); connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), @@ -424,8 +424,8 @@ void QuantaInit::initProject() connect(m_project, TQT_SIGNAL(messages(const TQString&)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - connect(m_project, TQT_SIGNAL(newtqStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus())); + connect(m_project, TQT_SIGNAL(newStatus()), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); @@ -438,10 +438,10 @@ void QuantaInit::initProject() connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)), + connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool))); + connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), + m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); @@ -679,7 +679,7 @@ void QuantaInit::openLastFiles() if (w) //w==0 might happen on quick close on startup { m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) ); -// m_quanta->slotUpdatetqStatus(w);//FIXME: +// m_quanta->slotUpdateStatus(w);//FIXME: } } @@ -963,7 +963,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; f.close(); } m_quanta->m_actions->clear(); @@ -990,7 +990,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; f.close(); } } else @@ -1180,9 +1180,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) "Backup file size: <b>%4</b><br>" "Backup created on: <b>%5</b><br><br>" "</qt>") - .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) - .tqarg(KIO::convertSize(origSize)).tqarg(origTime) - .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime)); + .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) + .arg(KIO::convertSize(origSize)).arg(origTime) + .arg(KIO::convertSize(backupSize)).arg(backupTime)); w->buttonLoad->setText(i18n("&Restore the file from backup")); w->buttonIgnore->setText(i18n("Do ¬ restore the file from backup")); delete w->warningLabel; @@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies() if (dependency.type == Dependency::Executable) { if (KStandardDirs::findExe(dependency.execName).isNull()) - errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); + errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); } else if (dependency.type == Dependency::Plugin) { if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName))) - errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); + errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); } } @@ -1500,7 +1500,7 @@ void QuantaInit::checkRuntimeDependencies() &appId); if (appId.isEmpty()) { - errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management")); + errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management")); } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); @@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas() int i = 0; for (QCStringList::iterator it = list.begin(); it != list.end(); ++it) { - if (TQString(*it).tqstartsWith("quanta", false)) + if (TQString(*it).startsWith("quanta", false)) ++i; } return i; diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 797c1172..3585cdb8 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -21,7 +21,7 @@ #include <tqwidget.h> #include <tqtabwidget.h> #include <tqtabbar.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdragobject.h> #include <tqobject.h> @@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting ) else // select opened if (switchToExisting) { - view->document()->checkDirtytqStatus(); + view->document()->checkDirtyStatus(); if (view != ViewManager::ref()->activeView()) { view->activate(); @@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting ) void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, bool switchToExisting, bool readOnly) { - bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false); + bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false); KURL url = urlToOpen; if (url.isLocalFile()) { @@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, TQString encoding = a_encoding; if (!newDocument(url, switchToExisting)) { - quantaApp->slotEnableIdleTimer(idleTimertqStatus); + quantaApp->slotEnableIdleTimer(idleTimerStatus); return; } Document *w = ViewManager::ref()->activeDocument(); @@ -211,23 +211,23 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, highlightIf->setHlMode(htmlIdx); } } - emit newtqStatus(); + emit newStatus(); } - quantaApp->slotEnableIdleTimer(idleTimertqStatus); + quantaApp->slotEnableIdleTimer(idleTimerStatus); } void QuantaDoc::slotOpeningFailed(const KURL &url) { Q_UNUSED(url); - bool signaltqStatus = signalsBlocked(); + bool signalStatus = signalsBlocked(); blockSignals(false); emit hideSplash(); //Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified /* - KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); */ ViewManager::ref()->removeActiveView(); - blockSignals(signaltqStatus); + blockSignals(signalStatus); } void QuantaDoc::slotOpeningCompleted(const KURL &url) @@ -240,7 +240,7 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url) quantaApp->reparse(true); if (url.isLocalFile()) quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol)); - quantaApp->slotNewtqStatus(); + quantaApp->slotNewStatus(); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view())); emit eventHappened("after_open", url.url(), TQString()); @@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup() if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) ) { - TQString caption = i18n("Attributes of <%1>").tqarg(tagName); + TQString caption = i18n("Attributes of <%1>").arg(tagName); attribMenu->insertTitle( caption ); AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName ); @@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup() } } else { - TQString message = i18n("Unknown tag: %1").tqarg(tagName); + TQString message = i18n("Unknown tag: %1").arg(tagName); quantaApp->slotStatusMsg( message ); } } diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index 0da3ff5e..ac7069d9 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -48,7 +48,7 @@ public slots: void slotOpeningFailed(const KURL &url); signals: - void newtqStatus(); + void newStatus(); void hideSplash(); void eventHappened(const TQString&, const TQString&, const TQString& ); diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index cb4c8ef9..f9a0dc06 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -21,7 +21,7 @@ #include <tqtabbar.h> #include <tqtabwidget.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqdom.h> #include <tqfile.h> @@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document) reloadUpdateTimers(); - m_currentViewsLayout = -1; //force loading of this tqlayout + m_currentViewsLayout = -1; //force loading of this layout slotSetSourceLayout(); } @@ -263,7 +263,7 @@ void QuantaView::addCustomWidget(TQWidget *widget, const TQString &label) void QuantaView::reloadLayout() { int currentViewsLayout = m_currentViewsLayout; - m_currentViewsLayout = -1; //force loading of this tqlayout + m_currentViewsLayout = -1; //force loading of this layout switch (currentViewsLayout) { case SourceOnly: @@ -395,7 +395,7 @@ void QuantaView::slotSetSourceAndVPLLayout() if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -444,7 +444,7 @@ void QuantaView::slotSetVPLOnlyLayout() if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -1021,7 +1021,7 @@ void QuantaView::activated() ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar); m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0); quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view()); - m_document->checkDirtytqStatus(); + m_document->checkDirtyStatus(); StructTreeView::ref()->useOpenLevelSetting = true; quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier()); @@ -1064,7 +1064,7 @@ bool QuantaView::saveModified(bool ask) int want_save; if (ask) want_save = KMessageBox::warningYesNoCancel(this, - i18n("The file \"%1\" has been modified.\nDo you want to save it?").tqarg(fileName), + i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName), i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard()); else want_save = KMessageBox::Yes; @@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url) return false; //saving to a local file failed } else //successful saving to a local file { - m_document->setDirtytqStatus(false); + m_document->setDirtyStatus(false); m_document->removeBackup(quantaApp->config()); fileWatcher->addFile(m_document->url().path()); // kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl; @@ -1176,7 +1176,7 @@ void QuantaView::slotSavingFailed(const TQString &error) void QuantaView::slotSavingCompleted() { m_saveResult = true; - m_document->setDirtytqStatus(false); + m_document->setDirtyStatus(false); m_document->removeBackup(quantaApp->config()); if (m_eventLoopStarted) tqApp->exit_loop(); diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index bf80aff1..3e34c43a 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -105,7 +105,7 @@ public: void reloadVPLView(bool force = false); /** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */ void reloadSourceView(bool force = false); - /** Return the curren views tqlayout*/ + /** Return the curren views layout*/ int currentViewsLayout() {return m_currentViewsLayout;} void reloadLayout(); @@ -221,7 +221,7 @@ private: TQGuardedPtr<KafkaDocument> m_kafkaDocument; TQSplitter *m_splitter; TQGridLayout *m_viewLayout; - int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL + int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL int m_currentFocus; bool m_saveResult; bool m_eventLoopStarted; diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 6a6294e3..9446daf6 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -95,7 +95,7 @@ QuantaView* ViewManager::createView(const TQString &caption) connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewtqStatus())); + connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); @@ -107,8 +107,8 @@ QuantaView* ViewManager::createView(const TQString &caption) void ViewManager::createNewDocument() { int i = 1; - while (isOpened(KURL("file:"+i18n("Untitled%1").tqarg(i)))) i++; - TQString fname = i18n("Untitled%1").tqarg(i); + while (isOpened(KURL("file:"+i18n("Untitled%1").arg(i)))) i++; + TQString fname = i18n("Untitled%1").arg(i); QuantaView *view = createView(fname); #ifdef ENABLE_EDITORS @@ -139,7 +139,7 @@ void ViewManager::createNewDocument() quantaApp->setFocusProxy(w->view()); w->view()->setFocusPolicy(TQ_WheelFocus); - connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus())); + connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -226,7 +226,7 @@ void ViewManager::slotViewActivated(KMdiChildView *view) parser->clearGroups(); parser->setSAParserEnabled(true); quantaApp->reparse(true); //FIXME - quantaApp->slotNewtqStatus(); + quantaApp->slotNewStatus(); quantaApp->slotNewLineColumn(); typingInProgress = false; //need to reset, as it's set to true in the above slots m_lastActiveView = qView; @@ -257,16 +257,16 @@ void ViewManager::slotCloseOtherTabs() if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document()) ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false); KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator(); - //save the tqchildren first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView *> tqchildren; + //save the children first to a list, as removing invalidates our iterator + TQValueList<KMdiChildView *> children; for (it->first(); !it->isDone(); it->next()) { - tqchildren.append(it->currentItem()); + children.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator<KMdiChildView *> childIt; - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; qView = dynamic_cast<QuantaView*>(view); @@ -286,7 +286,7 @@ void ViewManager::slotCloseOtherTabs() if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; qView = dynamic_cast<QuantaView*>(view); @@ -311,7 +311,7 @@ void ViewManager::slotCloseOtherTabs() } } - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; if (view != currentView) @@ -427,16 +427,16 @@ bool ViewManager::closeAll(bool createNew) parser->setSAParserEnabled(false); KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator(); QuantaView *view; - //save the tqchildren first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView *> tqchildren; + //save the children first to a list, as removing invalidates our iterator + TQValueList<KMdiChildView *> children; for (it->first(); !it->isDone(); it->next()) { - tqchildren.append(it->currentItem()); + children.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator<KMdiChildView *> childIt; - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -455,7 +455,7 @@ bool ViewManager::closeAll(bool createNew) if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -484,7 +484,7 @@ bool ViewManager::closeAll(bool createNew) disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew) if (createNew) { createNewDocument(); - quantaApp->slotNewtqStatus(); + quantaApp->slotNewStatus(); } emit filesClosed(true); return true; diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index baf6bbe5..d2da546f 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -17,12 +17,12 @@ // QT includes #include <tqeventloop.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqlabel.h> #include <tqimage.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpoint.h> #include <tqregexp.h> #include <tqlineedit.h> @@ -106,7 +106,7 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) text.append( "<br>" + item->text(1)); } if ( !text.isEmpty() ) - tip(m_view->tqitemRect(item), text); + tip(m_view->itemRect(item), text); } @@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder() while (item) { if (item->isDir() && item->isOpen()) { updateDirectory( item->url() ); - kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); // dive into the tree first newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild()); if (newItem) { @@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") ) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } else if ( QuantaCommon::checkMimeGroup(urlToOpen, "image") ) //it may be an image { @@ -385,7 +385,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if (QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } } } @@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) } qfile.close(); - quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").tqarg(ct)); - quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").tqarg(imgct)); - quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize)); - quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize)); + quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").arg(ct)); + quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").arg(imgct)); + quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").arg(fimgsize)); + quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").arg(fsize+fimgsize)); } else if (mimetype.contains("image")) { // assume it's an image file TQImage imagefile=TQImage(nameForInfo); - quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height())); + quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height())); quantaFileProperties->imageNum->hide(); quantaFileProperties->imageSize->hide(); quantaFileProperties->totalSize->hide(); @@ -536,7 +536,7 @@ void BaseTreeView::slotOpen() if (item) { emit open(item); - item->tqrepaint(); + item->repaint(); } } @@ -648,7 +648,7 @@ void BaseTreeView::slotCopy() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( currentURL().prettyURL() ); } } @@ -658,7 +658,7 @@ void BaseTreeView::slotPaste() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url = currentURL(); @@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url) bool BaseTreeView::isPathInClipboard() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it ) { @@ -972,13 +972,13 @@ void BaseTreeView::slotDocumentClosed(const KURL& url) item = (*it)->findTVIByURL(url); if (item) { - item->tqrepaint(); + item->repaint(); } } /* TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); }*/ } @@ -1038,7 +1038,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) bool proceed = true; if (QExtFileInfo::exists(newURL, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { @@ -1184,7 +1184,7 @@ void BaseTreeView::slotCreateSiteTemplate() error = true; if (error) - KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } @@ -1216,7 +1216,7 @@ void BaseTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index b0418558..94c4611a 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -141,7 +141,7 @@ public: virtual ~BaseTreeView(); /** - * Saves the list view's tqlayout (column widtsh, column order, sort column) + * Saves the list view's layout (column widtsh, column order, sort column) * to a KConfig group. Reimplemented to save the open folders. * * @param config the KConfig object to write to @@ -150,7 +150,7 @@ public: void saveLayout(KConfig *config, const TQString &group); /** - * Reads the list view's tqlayout from a KConfig group as stored with + * Reads the list view's layout from a KConfig group as stored with * saveLayout. Reimplemented to load the open folders. * * @param config the KConfig object to read from diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index bebac21d..d543f5d0 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -261,7 +261,7 @@ void FilesTreeView::slotAddToTop() topURLAliases.insert(url.url(), aliasName); newBranch(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } else { // remove @@ -287,7 +287,7 @@ void FilesTreeView::slotNewTopFolder() newBranch(url); topURLList.append(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } @@ -324,7 +324,7 @@ void FilesTreeView::slotChangeAlias() newBranch(url); } } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } } diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index dcfab886..205e5bf0 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -154,7 +154,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); @@ -400,7 +400,7 @@ void ProjectTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); @@ -425,7 +425,7 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove) TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); if ( !askForRemove || - KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) + KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) { if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1); emit removeFromProject(url); @@ -527,7 +527,7 @@ void ProjectTreeView::slotAlwaysUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); + emit changeUploadStatus(url, ProjectURL::AlwaysUpload); } } @@ -541,7 +541,7 @@ void ProjectTreeView::slotNeverUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::NeverUpload); + emit changeUploadStatus(url, ProjectURL::NeverUpload); } } @@ -555,7 +555,7 @@ void ProjectTreeView::slotConfirmUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload); + emit changeUploadStatus(url, ProjectURL::ConfirmUpload); } } @@ -573,7 +573,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() ProjectURL *proUrl = m_projectFiles->find( url ); if (proUrl) { - switch (proUrl->uploadtqStatus) + switch (proUrl->uploadStatus) { case ProjectURL::NeverUpload: { @@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() } } -void ProjectTreeView::slotChangeDocumentFoldertqStatus() +void ProjectTreeView::slotChangeDocumentFolderStatus() { KFileTreeViewItem *kftvi = currentKFileTreeViewItem(); if (! kftvi) @@ -606,14 +606,14 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus() if (!m_documentFolderList.contains(currentURL())) { m_documentFolderList.append(currentURL()); - emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); - emit changeDocumentFoldertqStatus(url, true); + emit changeUploadStatus(url, ProjectURL::AlwaysUpload); + emit changeDocumentFolderStatus(url, true); } else { m_documentFolderList.remove(currentURL()); - emit changeUploadtqStatus(url, false); + emit changeUploadStatus(url, false); } - currentItem()->tqrepaint(); + currentItem()->repaint(); } bool ProjectTreeView::isDocumentFolder(const KURL &url) diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index 1e290328..b5dfa5a5 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -83,7 +83,7 @@ public slots: // Public slots /** makes the url visible in the tree */ void slotViewActivated(const KURL&); /** fills the list with the url's of the open folder */ - void slotGetTreetqStatus(TQStringList *folderToOpen) + void slotGetTreeStatus(TQStringList *folderToOpen) { m_projectDir->addOpenFolder(folderToOpen); } @@ -107,8 +107,8 @@ signals: // Signals void loadToolbarFile(const KURL&); void uploadProject(); void changeFileDescription(const KURL& url, const TQString& desc); - void changeUploadtqStatus(const KURL& url, int status); - void changeDocumentFoldertqStatus(const KURL& url, bool status); + void changeUploadStatus(const KURL& url, int status); + void changeDocumentFolderStatus(const KURL& url, bool status); void reloadProject(); private: @@ -170,7 +170,7 @@ private slots: // Private slots void slotNeverUpload(); void slotConfirmUpload(); void slotUploadMenuAboutToShow(); - void slotChangeDocumentFoldertqStatus(); + void slotChangeDocumentFolderStatus(); }; #endif diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 109caf2f..d70a6f6e 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>400</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>92</width> <height>20</height> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>93</width> <height>20</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index eb64dd0b..d7b5b3cc 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -36,7 +36,7 @@ #include <tqlineedit.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <tqtextedit.h> +#include <textedit.h> //other includes #include <libxml/xmlmemory.h> diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 1618d588..ad2309da 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); } } diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index e897d14c..0325645e 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -116,7 +116,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString { node->tag->write()->setErrorMark(line); TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper(); - parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName)); + parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName)); } TQString nextTagName; if (node->next) @@ -129,12 +129,12 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString (!node->next || ( !node->getClosingNode())) ) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } else if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE") { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); + parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").arg(line + 1).arg(col + 1).arg(qTagName).arg(node->tag->dtd()->nickName)); } } break; @@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString if (!node->prev || qTagName != "/" + qPrevTagName) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } } title = tag->tagStr().left(70).stripWhiteSpace(); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 24f48174..5cfe5dc9 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly) groupsCount = 0; } -/** tqrepaint document structure */ +/** repaint document structure */ void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly) { timer->restart(); @@ -1005,7 +1005,7 @@ void StructTreeView::slotOpenFile() emit openImage(url); } } else - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 66c6b68e..2087f3fc 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -72,7 +72,7 @@ public: bool useOpenLevelSetting; public slots: // Public slots - /** tqrepaint document structure */ + /** repaint document structure */ void slotReparse(Document *w, Node* node, int openLevel = 3,bool groupOnly=false); void slotMouseClicked(int button, TQListViewItem*, const TQPoint&, int); void slotDoubleClicked( TQListViewItem * ); diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 50e4825e..776ac366 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -81,11 +81,11 @@ ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); - TQRect r = m_listView->tqitemRect( this ); + TQRect r = m_listView->itemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->tqitemRect( this ); + r = m_listView->itemRect( this ); } r.setX( m_listView->header()->sectionPos( 0 ) + 20); r.setWidth( m_listView->header()->sectionSize( 0 ) - 20); @@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column) void AttributeItem::placeEditor( TQWidget *w, int column) { - TQRect r = m_listView->tqitemRect( this ); + TQRect r = m_listView->itemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->tqitemRect( this ); + r = m_listView->itemRect( this ); } if(column == 1) { diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 0ef63151..4d49c841 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -18,7 +18,7 @@ #include <tqtimer.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> //kde includes @@ -458,11 +458,11 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout"); attrTree = new TagAttributeTree(this, "TagAttributeTree"); - attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 ); nodeName = new TQLabel(this, i18n( "Node Name" ).ascii()); - nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); + nodeName->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); widgetLayout->addWidget( nodeName, 0, 0 ); deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii()); @@ -475,7 +475,7 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char deleteAll->setPixmap(SmallIcon("editdelete")); deleteAll->setMaximumHeight(32); deleteAll->setMaximumWidth(32); - TQToolTip::add(deleteAll, i18n("Delete the current tag and all its tqchildren.")); + TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children.")); widgetLayout->addWidget( deleteTag, 0, 2 ); widgetLayout->addWidget( deleteAll, 0, 3 ); @@ -515,7 +515,7 @@ void EnhancedTagAttributeTree::showCaption() if(curNode->tag->type == Tag::XmlTag || curNode->tag->type == Tag::XmlTagEnd || curNode->tag->type == Tag::ScriptTag) { - TQString s = i18n("Current tag: <b>%1</b>").tqarg(curNode->tag->name); + TQString s = i18n("Current tag: <b>%1</b>").arg(curNode->tag->name); nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50)); } else if(curNode->tag->type == Tag::Text) diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index d08f6b28..a8cb7705 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 98fc5048..c26dc395 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -21,13 +21,13 @@ // QT includes #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqpixmap.h> #include <tqheader.h> #include <tqpoint.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqregexp.h> #include <tqlabel.h> #include <tqmap.h> @@ -386,7 +386,7 @@ void TemplatesTreeView::slotNewDir() createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -404,7 +404,7 @@ void TemplatesTreeView::slotNewDir() if (!dir.mkdir(startDir+"/"+createDirDlg->dirName->text())) { KMessageBox::error(this,i18n("Error while creating the new folder.\n \ - Maybe you do not have permission to write in the %1 folder.").tqarg(startDir)); + Maybe you do not have permission to write in the %1 folder.").arg(startDir)); return; } if (! createDirDlg->parentAttr->isChecked()) @@ -467,13 +467,13 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e) bool proceed = true; if (QExtFileInfo::exists(url, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { if (!QuantaNetAccess::upload(tempFile->name(), url, m_parent, false)) { - KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } delete tempFile; @@ -619,7 +619,7 @@ void TemplatesTreeView::slotProperties() m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url; @@ -873,9 +873,9 @@ void TemplatesTreeView::slotDelete() KURL url = currentURL(); TQString msg; if ( currentKFileTreeViewItem()->isDir() ) - msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path()); else - msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path()); if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { @@ -1072,7 +1072,7 @@ void TemplatesTreeView::slotExtractSiteTemplate() } else error = true; if (error) - KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index c4c40197..9c055424 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -28,7 +28,7 @@ #include "resource.h" UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; @@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con } UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 8f5457e2..259b81dc 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -56,8 +56,8 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) TQListViewItem *itIter = it ? it->firstChild() : firstChild(); - // bitFlag structure: (0/1)all tqchildren exist (0/1)no tqchildren exist. - // We don't need some tqchildren as a bit flag, because that's implied if the bits are "00". + // bitFlag structure: (0/1)all children exist (0/1)no children exist. + // We don't need some children as a bit flag, because that's implied if the bits are "00". int bitFlags = 3; int retVal = 1; @@ -73,17 +73,17 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) UploadTreeFolder *itF = static_cast<UploadTreeFolder *>(itIter); if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -95,13 +95,13 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) if ( itF->isSelected() ) { itF->setWhichPixmap("check"); - // Turn off "no tqchildren" + // Turn off "no children" if ( bitFlags % 2 == 1 ) bitFlags -= 1; } else { itF->setWhichPixmap("check_clear"); - // Turn off "all tqchildren". + // Turn off "all children". if (bitFlags >> 1 == 1) bitFlags -= 2; } @@ -162,17 +162,17 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) if ( itF ) { if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -199,7 +199,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) { bool hasSelected = false; bool allSelected = true; - //check if the item has any tqchildren's selected + //check if the item has any children's selected TQListViewItemIterator iter(itF->firstChild()); while ( iter.current() && iter.current() != itF->nextSibling()) { diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index b4d43f48..81db90c2 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -17,7 +17,7 @@ //qt includes #include <tqdatetime.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> //kde includes #include <kapplication.h> @@ -85,11 +85,11 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 EventAction ev = *it; if (ev.type == EventAction::Internal) { - if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) return; } else { - if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) return; } KURL url = KURL::fromPathOrURL(argument1); @@ -221,7 +221,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 } } if (!m_eventNames.contains(name)) - KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").tqarg(name), i18n("Event Handling Error")); + KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").arg(name), i18n("Event Handling Error")); } bool QPEvents::handleEvent(const EventAction& ev) @@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQTextStream stream(&file); stream.setEncoding(TQTextStream::UnicodeUTF8); //Note: the log text should not be translated. - TQString s = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + ": "; + TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": "; s.append( "Event : " + m_eventName + " : "); s.append( "Action: " + ev.action + " : "); if (ev.arguments[1] == "full") @@ -309,11 +309,11 @@ bool QPEvents::handleEvent(const EventAction& ev) } if (!result) { - KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").tqarg(url.path())); + KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").arg(url.path())); return false; } } else - KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").tqarg(ev.action)); + KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").arg(ev.action)); } else if (ev.type == EventAction::External) { @@ -336,7 +336,7 @@ bool QPEvents::handleEvent(const EventAction& ev) { action->activate(); } else - KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").tqarg(name), i18n("Action Execution Error")); + KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").arg(name), i18n("Action Execution Error")); } else KMessageBox::sorry(0L, i18n("Unsupported external event action.")); } else diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 3208a874..e5329b8a 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -196,7 +196,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse } menu.insertItem( - TQString("%1 - \"%2\"").tqarg( (*it)->line+1 ).tqarg( bText ), + TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), 0, (*it)->line, idx ); insertedItems++; @@ -219,15 +219,15 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse idx = ++old_menu_count; if ( next ) { - m_goNext->setText( i18n("&Next: %1 - \"%2\"").tqarg( next->line + 1 ) - .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); + m_goNext->setText( i18n("&Next: %1 - \"%2\"").arg( next->line + 1 ) + .arg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); m_goNext->plug( &menu, idx ); idx++; } if ( prev ) { - m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").tqarg(prev->line + 1 ) - .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); + m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").arg(prev->line + 1 ) + .arg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); m_goPrevious->plug( &menu, idx ); idx++; } diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index e50e55da..7d86f59e 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -23,7 +23,7 @@ #include <tqdir.h> #include <tqdom.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqwidget.h> //kde includes @@ -50,7 +50,7 @@ #include <kstringhandler.h> #include <tqwhatsthis.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdatastream.h> #include "qextfileinfo.h" @@ -382,8 +382,8 @@ TQString QuantaCommon::qUrl(const KURL &url) void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url) { KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the parent folder or that the connection to<br><b>%2</b><br> is valid.</qt>") - .tqarg(url.prettyURL(0, KURL::StripFileProtocol)) - .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));} + .arg(url.prettyURL(0, KURL::StripFileProtocol)) + .arg(url.protocol()+"://"+url.user()+"@"+url.host()));} /** Adds the backslash before the special chars (like ?, *, . ) so the returned @@ -596,7 +596,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString if (!kapp->inherits("KUniqueApplication")) { pid_t pid = ::getpid(); - app += TQString("-%1").tqarg(pid); + app += TQString("-%1").arg(pid); } DCOPRef quantaRef(app.utf8(), interface.utf8()); DCOPReply reply; @@ -707,7 +707,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window) if (QExtFileInfo::exists(url, false, window)) { if (KMessageBox::warningContinueCancel(window, - i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) + i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) result = false; } @@ -746,8 +746,8 @@ TQString QuantaCommon::encodedChar(uint code) { if (replacementMap.contains(code)) - return TQString("%1;").tqarg(replacementMap[code]); + return TQString("%1;").arg(replacementMap[code]); else - return TQString("&#%1;").tqarg(code); + return TQString("&#%1;").arg(code); } diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index 69ddd0d5..375f6f6d 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -182,7 +182,7 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b { TQString nice = QExtFileInfo::toRelative(saveUrl, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").tqarg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) + if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").arg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) { return; } @@ -207,7 +207,7 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool { TQString nice = QExtFileInfo::toRelative(url, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) { return false; } @@ -230,7 +230,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").tqarg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").arg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) { return false; } @@ -243,7 +243,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co if (confirm) { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").tqarg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); + return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").arg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); } return true; } diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index f782ea9e..1db14cf1 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -338,10 +338,10 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").arg(pid)); } else { - command.replace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").arg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -461,7 +461,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -472,7 +472,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { @@ -592,10 +592,10 @@ bool TagAction::slotActionActivated() pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").arg(pid)); } else { - command.replace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").arg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -715,7 +715,7 @@ bool TagAction::slotActionActivated() if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -726,7 +726,7 @@ bool TagAction::slotActionActivated() proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { @@ -787,7 +787,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen ) if ( firstOutput ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); } emit showMessage(text, true); } else @@ -847,7 +847,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen ) if ( firstError ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); } emit showMessage(text, true); } @@ -970,7 +970,7 @@ void TagAction::slotProcessExited(KProcess *process) tqApp->exit_loop(); loopStarted = false; } - emit showMessage(i18n("The \"%1\" script has exited.").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script has exited.").arg(actionText()), false); delete process; } @@ -1008,7 +1008,7 @@ void TagAction::execute(bool blocking) /** Timeout occurred while waiting for some network function to return. */ void TagAction::slotTimeout() { - if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").tqarg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) + if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").arg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) { if (::kill(-proc->pid(), SIGTERM)) { diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 5331413a..b3e58d56 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -14,7 +14,7 @@ //qt includes #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqpoint.h> #include <tqtabbar.h> @@ -307,18 +307,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); - TQObjectList* tqchildrenList = queryList("KToolBarButton"); - for (uint i = 0; i < tqchildrenList->count(); i++) + TQObjectList* childrenList = queryList("KToolBarButton"); + for (uint i = 0; i < childrenList->count(); i++) { - KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i))); + KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(childrenList->at(i))); TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); if (TQRect(p1, p2).contains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); break; } } @@ -341,7 +341,7 @@ void QuantaToolBar::slotEditAction() void QuantaToolBar::slotRemoveAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").arg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { emit removeAction(m_toolbarTab->tabUnderMouse, currentActionName); } |