summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--systemsettings/kcmultiwidget.cpp2
-rw-r--r--systemsettings/kcscrollview.cpp4
-rw-r--r--systemsettings/kcscrollview.h2
-rw-r--r--systemsettings/mainwindow.cpp10
-rw-r--r--systemsettings/modulesview.cpp16
-rw-r--r--systemsettings/modulesview.h4
6 files changed, 19 insertions, 19 deletions
diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index 5805a3a..da4484f 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -23,7 +23,7 @@
#include <tqcursor.h>
#include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <kaboutdata.h>
diff --git a/systemsettings/kcscrollview.cpp b/systemsettings/kcscrollview.cpp
index 4566337..a543ac7 100644
--- a/systemsettings/kcscrollview.cpp
+++ b/systemsettings/kcscrollview.cpp
@@ -25,8 +25,8 @@ KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQ
mainChild = 0;
}
-TQSize KCScrollView::sizeHint() const {
- TQSize vphint = mainChild->sizeHint();
+TQSize KCScrollView::tqsizeHint() const {
+ TQSize vphint = mainChild->tqsizeHint();
vphint.setWidth(vphint.width()+2*frameWidth());
vphint.setHeight(vphint.height()+2*frameWidth());
return vphint;
diff --git a/systemsettings/kcscrollview.h b/systemsettings/kcscrollview.h
index e023899..dc9fbeb 100644
--- a/systemsettings/kcscrollview.h
+++ b/systemsettings/kcscrollview.h
@@ -26,7 +26,7 @@ class KCScrollView : public TQScrollView {
public:
KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
virtual void addChild(TQWidget *child, int x=0, int y=0);
private:
TQWidget *mainChild;
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp
index 1852b0c..0c21736 100644
--- a/systemsettings/mainwindow.cpp
+++ b/systemsettings/mainwindow.cpp
@@ -28,7 +28,7 @@
#include <tqtoolbutton.h>
#include <klocale.h>
#include <kservicegroup.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwidgetstack.h>
#include <tqtimer.h>
#include <kiconloader.h>
@@ -289,7 +289,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
void MainWindow::timerResize() {
TQSize currentSize = size();
- TQSize newSize = currentSize.expandedTo(sizeHint());
+ TQSize newSize = currentSize.expandedTo(tqsizeHint());
// Avoid resizing if possible.
if(newSize!=currentSize) {
resize(newSize);
@@ -298,7 +298,7 @@ void MainWindow::timerResize() {
void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) {
if ( currentModule->aboutData() ) {
- aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").arg(
+ aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").tqarg(
currentModule->moduleInfo().moduleName().replace("&","&&")));
aboutModuleAction->setIcon(currentModule->moduleInfo().icon());
aboutModuleAction->setEnabled(true);
@@ -349,11 +349,11 @@ void MainWindow::slotSearchHits(const TQString &query, int *hitList, int length)
} else {
if(length>=1) {
- generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).arg(hitList[0]));
+ generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).tqarg(hitList[0]));
}
if(length>=2) {
- advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).arg(hitList[1]));
+ advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).tqarg(hitList[1]));
}
}
diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp
index a963058..ef920f1 100644
--- a/systemsettings/modulesview.cpp
+++ b/systemsettings/modulesview.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <klocale.h>
#include <kservicegroup.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kiconloader.h>
#include <kcmultidialog.h>
#include <kdialogbase.h>
@@ -43,7 +43,7 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
this->rootMenu = rootMenu;
this->menuPath = menuPath;
- TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "layout" );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout" );
displayName = this->rootMenu->caption;
@@ -58,13 +58,13 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
TQFrame *line = new TQFrame( this, "line");
line->setFrameShadow( TQFrame::Sunken );
line->setFrameShape( TQFrame::HLine );
- layout->addWidget( line );
+ tqlayout->addWidget( line );
}
// Build the row of modules/icons
- createRow( (*it).subMenu, layout );
+ createRow( (*it).subMenu, tqlayout );
}
- layout->addStretch(1);
+ tqlayout->addStretch(1);
// Make empty iconView for the search widget
if( groups.count()==0 ) {
@@ -112,14 +112,14 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
// Heaer Icon
TQLabel *icon = new TQLabel( this, "groupicon" );
icon->setPixmap( SmallIcon( group->icon() ) );
- icon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
+ icon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
(TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) );
rowLayout->addWidget( icon );
// Header Name
TQLabel *textLabel = new TQLabel( this, "groupcaption" );
textLabel->setText( group->caption() );
- textLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
+ textLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
(TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth()));
TQFont textLabel_font( textLabel->font() );
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.
- iconView->setMinimumHeight( iconView->minimumSizeHint().height() );
+ iconView->setMinimumHeight( iconView->tqminimumSizeHint().height() );
}
void ModulesView::clearSelection() {
diff --git a/systemsettings/modulesview.h b/systemsettings/modulesview.h
index 49a9d07..a334d75 100644
--- a/systemsettings/modulesview.h
+++ b/systemsettings/modulesview.h
@@ -34,7 +34,7 @@ public:
: KIconView( parent, name ){ };
// Figure out the hight/width to have only one row
- TQSize minimumSizeHint() const {
+ TQSize tqminimumSizeHint() const {
int width = 0;
/*
for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
@@ -94,7 +94,7 @@ private:
KCModuleMenu *rootMenu;
TQString menuPath;
- void createRow( const TQString &parentPath, TQBoxLayout *layout );
+ void createRow( const TQString &parentPath, TQBoxLayout *tqlayout );
};
#endif // MODULESVIEW_H
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 12:01:25 +0000