diff options
Diffstat (limited to 'kresources')
| -rw-r--r-- | kresources/configdialog.cpp | 2 | ||||
| -rw-r--r-- | kresources/configpage.cpp | 10 | ||||
| -rw-r--r-- | kresources/kcmkresources.cpp | 2 | ||||
| -rw-r--r-- | kresources/manager.h | 2 | ||||
| -rw-r--r-- | kresources/resource.h | 2 | ||||
| -rw-r--r-- | kresources/selectdialog.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp index bbebc47a3..a78fb7c7f 100644 --- a/kresources/configdialog.cpp +++ b/kresources/configdialog.cpp @@ -27,7 +27,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include "factory.h" diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp index fa098b105..4aea559ff 100644 --- a/kresources/configpage.cpp +++ b/kresources/configpage.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <kcombobox.h> @@ -106,9 +106,9 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->tqlayout()->setSpacing( 6 ); - groupBox->tqlayout()->setMargin( 11 ); - TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2 ); + groupBox->layout()->setSpacing( 6 ); + groupBox->layout()->setMargin( 11 ); + TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 ); mFamilyCombo = new KComboBox( false, groupBox ); groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 ); @@ -130,7 +130,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mEditButton->setEnabled( false ); mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); - buttonBox->tqlayout(); + buttonBox->layout(); groupBoxLayout->addWidget( buttonBox, 1, 1 ); diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp index 41fdb91fe..722c604df 100644 --- a/kresources/kcmkresources.cpp +++ b/kresources/kcmkresources.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kgenericfactory.h> diff --git a/kresources/manager.h b/kresources/manager.h index c11ecaab5..ab1562716 100644 --- a/kresources/manager.h +++ b/kresources/manager.h @@ -335,7 +335,7 @@ class Manager : private ManagerNotifier ++it ) { TQString desc = mFactory->typeName( *it ); if ( !mFactory->typeDescription( *it ).isEmpty() ) - desc += TQString::tqfromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::tqfromLatin1(")"); + desc += TQString::fromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::fromLatin1(")"); typeDescs.append( desc ); } diff --git a/kresources/resource.h b/kresources/resource.h index eec790bbe..cb9dadfc6 100644 --- a/kresources/resource.h +++ b/kresources/resource.h @@ -144,7 +144,7 @@ class ResourceExampleConfig : public KRES::ResourceConfigWidget <B>resourceexampleconfig.cpp</B>: \code -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kresources/resourceconfigwidget.h> #include "resourceexample.h" diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp index 5ae9bdcea..869775989 100644 --- a/kresources/selectdialog.cpp +++ b/kresources/selectdialog.cpp @@ -27,7 +27,7 @@ #include <kmessagebox.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include "resource.h" @@ -66,7 +66,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, // setup listbox uint counter = 0; for ( uint i = 0; i < list.count(); ++i ) { - Resource *resource = list.tqat( i ); + Resource *resource = list.at( i ); if ( resource && !resource->readOnly() ) { mResourceMap.insert( counter, resource ); mResourceId->insertItem( resource->resourceName() ); |