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

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent f191e6da45
commit b5b62ae9b3
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
systemsettings/kcmultiwidget.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <tqcursor.h> #include <tqcursor.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kaboutdata.h> #include <kaboutdata.h>

4
systemsettings/kcscrollview.cpp
Unescape View File

@ -25,8 +25,8 @@ KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQ
mainChild = 0; mainChild = 0;
} }
TQSize KCScrollView::tqsizeHint() const { TQSize KCScrollView::sizeHint() const {
TQSize vphint = mainChild->tqsizeHint(); TQSize vphint = mainChild->sizeHint();
vphint.setWidth(vphint.width()+2*frameWidth()); vphint.setWidth(vphint.width()+2*frameWidth());
vphint.setHeight(vphint.height()+2*frameWidth()); vphint.setHeight(vphint.height()+2*frameWidth());
return vphint; return vphint;

2
systemsettings/kcscrollview.h
Unescape View File

@ -26,7 +26,7 @@ class KCScrollView : public TQScrollView {
public: public:
KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual void addChild(TQWidget *child, int x=0, int y=0); virtual void addChild(TQWidget *child, int x=0, int y=0);
private: private:
TQWidget *mainChild; TQWidget *mainChild;

10
systemsettings/mainwindow.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <tqlayout.h> #include <layout.h>
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -289,7 +289,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
void MainWindow::timerResize() { void MainWindow::timerResize() {
TQSize currentSize = size(); TQSize currentSize = size();
TQSize newSize = currentSize.expandedTo(tqsizeHint()); TQSize newSize = currentSize.expandedTo(sizeHint());
// Avoid resizing if possible. // Avoid resizing if possible.
if(newSize!=currentSize) { if(newSize!=currentSize) {
resize(newSize); resize(newSize);
@ -298,7 +298,7 @@ void MainWindow::timerResize() {
void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) { void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) {
if ( currentModule->aboutData() ) { if ( currentModule->aboutData() ) {
aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").tqarg( aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").arg(
currentModule->moduleInfo().moduleName().replace("&","&&"))); currentModule->moduleInfo().moduleName().replace("&","&&")));
aboutModuleAction->setIcon(currentModule->moduleInfo().icon()); aboutModuleAction->setIcon(currentModule->moduleInfo().icon());
aboutModuleAction->setEnabled(true); aboutModuleAction->setEnabled(true);
@ -349,11 +349,11 @@ void MainWindow::slotSearchHits(const TQString &query, int *hitList, int length)
} else { } else {
if(length>=1) { if(length>=1) {
generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).tqarg(hitList[0])); generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).arg(hitList[0]));
} }
if(length>=2) { if(length>=2) {
advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).tqarg(hitList[1])); advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).arg(hitList[1]));
} }
} }

16
systemsettings/modulesview.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <klocale.h> #include <klocale.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <tqlayout.h> #include <layout.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kcmultidialog.h> #include <kcmultidialog.h>
#include <kdialogbase.h> #include <kdialogbase.h>
@ -43,7 +43,7 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
this->rootMenu = rootMenu; this->rootMenu = rootMenu;
this->menuPath = menuPath; this->menuPath = menuPath;
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout" ); TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "layout" );
displayName = this->rootMenu->caption; displayName = this->rootMenu->caption;
@ -58,13 +58,13 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
TQFrame *line = new TQFrame( this, "line"); TQFrame *line = new TQFrame( this, "line");
line->setFrameShadow( TQFrame::Sunken ); line->setFrameShadow( TQFrame::Sunken );
line->setFrameShape( TQFrame::HLine ); line->setFrameShape( TQFrame::HLine );
tqlayout->addWidget( line ); layout->addWidget( line );
} }
// Build the row of modules/icons // Build the row of modules/icons
createRow( (*it).subMenu, tqlayout ); createRow( (*it).subMenu, layout );
} }
tqlayout->addStretch(1); layout->addStretch(1);
// Make empty iconView for the search widget // Make empty iconView for the search widget
if( groups.count()==0 ) { if( groups.count()==0 ) {
@ -112,14 +112,14 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
// Heaer Icon // Heaer Icon
TQLabel *icon = new TQLabel( this, "groupicon" ); TQLabel *icon = new TQLabel( this, "groupicon" );
icon->setPixmap( SmallIcon( group->icon() ) ); icon->setPixmap( SmallIcon( group->icon() ) );
icon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, icon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
(TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) ); (TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) );
rowLayout->addWidget( icon ); rowLayout->addWidget( icon );
// Header Name // Header Name
TQLabel *textLabel = new TQLabel( this, "groupcaption" ); TQLabel *textLabel = new TQLabel( this, "groupcaption" );
textLabel->setText( group->caption() ); textLabel->setText( group->caption() );
textLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, textLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
(TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth())); (TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth()));
TQFont textLabel_font( textLabel->font() ); TQFont textLabel_font( textLabel->font() );
textLabel_font.setBold( true ); textLabel_font.setBold( true );
@ -160,7 +160,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
} }
// Force the height for those items that have two words. // Force the height for those items that have two words.
iconView->setMinimumHeight( iconView->tqminimumSizeHint().height() ); iconView->setMinimumHeight( iconView->minimumSizeHint().height() );
} }
void ModulesView::clearSelection() { void ModulesView::clearSelection() {

4
systemsettings/modulesview.h
Unescape View File

@ -34,7 +34,7 @@ public:
: KIconView( parent, name ){ }; : KIconView( parent, name ){ };
// Figure out the hight/width to have only one row // Figure out the hight/width to have only one row
TQSize tqminimumSizeHint() const { TQSize minimumSizeHint() const {
int width = 0; int width = 0;
/* /*
for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
@ -94,7 +94,7 @@ private:
KCModuleMenu *rootMenu; KCModuleMenu *rootMenu;
TQString menuPath; TQString menuPath;
void createRow( const TQString &parentPath, TQBoxLayout *tqlayout ); void createRow( const TQString &parentPath, TQBoxLayout *layout );
}; };
#endif // MODULESVIEW_H #endif // MODULESVIEW_H

Write Preview
Loading…
Cancel
Save