diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:24:43 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-19 19:42:58 +0200 |
| commit | 44b195a5922fe83a0769b971e8805cd2d3b5450e (patch) | |
| tree | 5c21414324c577cd4b13a13b51a0c37a57d6cd1b /quanta | |
| parent | 39356ff58b6a5a76b0ee7fa85c538598ededdeff (diff) | |
| download | tdewebdev-44b195a5922fe83a0769b971e8805cd2d3b5450e.tar.gz tdewebdev-44b195a5922fe83a0769b971e8805cd2d3b5450e.zip | |
Rename obsolete tq methods to standard names
(cherry picked from commit b0f531735b0175ba112ceb87d01731a7b2334772)
Diffstat (limited to 'quanta')
40 files changed, 104 insertions, 104 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/csseditors.ui b/quanta/components/csseditor/csseditors.ui index f47d5edd..2661d75d 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -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"> diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index c4e8c4f5..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"> @@ -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"> @@ -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"> @@ -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"> @@ -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"> 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/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui index 38123b7f..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"> diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 2622216d..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"> @@ -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"> @@ -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/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index 98f2b159..d4d2dc7b 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -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"> diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 87d7a71d..243f093f 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -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/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index 6f1da45d..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"> @@ -160,7 +160,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 636559ce..63fd1e58 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -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 0ec00485..ec85fa91 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -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"> diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index 5552afda..7fe28ce1 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -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/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 7019795b..821cdfcc 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -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"> diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 06d9e91b..397c99af 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -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/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index 3d187437..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"> @@ -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..19331def 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> // 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/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 37103df0..2d126794 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -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() diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 3ed2c464..012fd608 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -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/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index 05dd7cf4..b96e8b6f 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -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 6e0f58d6..fc3603c9 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -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"> diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 47a8afb5..98a81dc8 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type() void ProjectNewGeneral::setMargin(int i) { - tqlayout()->setMargin(i); + layout()->setMargin(i); } void ProjectNewGeneral::slotButtonTmpl() diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index 70a1c386..b58173eb 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -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"> diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index e06a290d..a23e8de7 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -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"> diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index 3154b0de..df0d8539 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -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"> @@ -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"> diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 8f9a50ac..42b79257 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -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"> diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index d17e1dff..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"> diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index f11ff1dd..a2798087 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -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; diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 07ac5a1e..32e1044c 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 fda7d0dc..527c9956 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 b2468de4..b8143c94 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -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()); @@ -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); @@ -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() ) ) @@ -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_init.cpp b/quanta/src/quanta_init.cpp index 3d79323e..83260d8f 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -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); } @@ -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(); } diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 60f90230..62b590a5 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -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: 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/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 924373b4..ef4fdbc3 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -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 ) { diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 18ff5ae0..3d99fa3c 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/templatedirform.ui b/quanta/treeviews/templatedirform.ui index 524e6fbf..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"> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 1cb52171..bcd4292c 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -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; |