summaryrefslogtreecommitdiffstats
path: root/kcontrol/filetypes
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kcontrol/filetypes
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/filetypes')
-rw-r--r--kcontrol/filetypes/filegroupdetails.cpp8
-rw-r--r--kcontrol/filetypes/filegroupdetails.h2
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp12
-rw-r--r--kcontrol/filetypes/filetypedetails.h2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp2
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp28
6 files changed, 27 insertions, 27 deletions
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index eb57f50ac..1c5127fca 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -27,12 +27,12 @@
FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQWidget * parentWidget = this;
- TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
+ TQWidget * tqparentWidget = this;
+ TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget,
0, KDialog::spacingHint());
- m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget );
- m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
+ m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget );
+ m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed );
// The order of those two items is very important. If you change it, fix typeslistitem.cpp !
new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index bb4d15bd7..c5724186e 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -23,7 +23,7 @@ class TypesListItem;
class TQButtonGroup;
/**
- * This widget contains the details for a filetype group.
+ * This widget tqcontains the details for a filetype group.
* Currently this only involves the embedding configuration.
*/
class FileGroupDetails : public QWidget
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index a678e0eb2..ffa6ff010 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -52,7 +52,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
grid->setRowStretch(1, 1);
grid->setRowStretch(2, 0);
- TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be"
+ TQWhatsThis::add( extensionLB, i18n("This box tqcontains a list of patterns that can be"
" used to identify files of the selected type. For example, the pattern *.txt is"
" associated with the file type 'text/plain'; all files ending in '.txt' are recognized"
" as plain text files.") );
@@ -97,10 +97,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
KDialog::spacingHint());
m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget );
- m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
+ m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed, 1 );
- m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
+ m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
// The order of those three items is very important. If you change it, fix typeslistitem.cpp !
new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
@@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
secondLayout->addSpacing(10);
embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
- embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
+ embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() );
connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
secondLayout->addWidget(embedServiceListWidget, 3);
@@ -241,8 +241,8 @@ void FileTypeDetails::updateAskSave()
mime->is( "text/xml" ) ||
mime->is( "inode/directory" ) ||
mimeType.startsWith( "image" ) ||
- mime->is( "multipart/x-mixed-replace" ) ||
- mime->is( "multipart/replace" ) ||
+ mime->is( "multipart/x-mixed-tqreplace" ) ||
+ mime->is( "multipart/tqreplace" ) ||
mimeType.startsWith( "print" ) )
{
neverAsk = true;
diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index b364d919d..c774d677f 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -13,7 +13,7 @@ class TQPushButton;
class KServiceListWidget;
/**
- * This widget contains the right part of the file type configuration
+ * This widget tqcontains the right part of the file type configuration
* dialog, that shows the details for a file type.
* It is implemented as a separate class so that it can be used by
* the keditfiletype program to show the details of a single mimetype.
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index ad60fc3de..d9d1f8138 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
// Widget shown on startup
m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
- m_emptyWidget->setAlignment(AlignCenter);
+ m_emptyWidget->tqsetAlignment(AlignCenter);
m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 8ff08d157..e2429e661 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major )
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting( major );
- m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
}
bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
@@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting(m_major);
- unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
if ( m_autoEmbed != oldAutoEmbed )
return true;
}
@@ -249,7 +249,7 @@ void TypesListItem::sync()
{
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
- config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
+ config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 );
return;
}
@@ -286,9 +286,9 @@ void TypesListItem::sync()
config.writeEntry("Hidden", false);
if ( m_autoEmbed == 2 )
- config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
+ config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false );
else
- config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
+ config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
m_bNewItem = false;
}
@@ -343,18 +343,18 @@ void TypesListItem::sync()
continue; // Only those which were added in init()
// Look in the correct list...
- if ( (isApplication && ! m_appServices.contains( pService->desktopEntryPath() ))
- || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() ))
+ if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() ))
+ || (!isApplication && !m_embedServices.tqcontains( pService->desktopEntryPath() ))
) {
// The service was in m_appServices but has been removed
// create a new .desktop file without this mimetype
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
- if ( mimeTypeList.contains( name() ) ) {
+ if ( mimeTypeList.tqcontains( name() ) ) {
// The mimetype is listed explicitly in the .desktop files, so
// just remove it and we're done
KConfig *desktop;
@@ -370,7 +370,7 @@ void TypesListItem::sync()
}
desktop->setDesktopGroup();
- mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
// Remove entry and the number that might follow.
@@ -438,7 +438,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->tqcontains( s->desktopEntryPath())
? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes();
for(TQStringList::ConstIterator it = mimeTypeList.begin();
@@ -477,10 +477,10 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
// merge new mimetype
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
- if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
+ if (!mimeTypeList.tqcontains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
{
KConfig *desktop;
if ( pService->type() == TQString("Service") )
@@ -495,7 +495,7 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
}
desktop->setDesktopGroup();
- mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
mimeTypeList.append(name());