diff options
Diffstat (limited to 'knode')
| -rw-r--r-- | knode/knfolder.cpp | 4 | ||||
| -rw-r--r-- | knode/knfolder.h | 2 | ||||
| -rw-r--r-- | knode/knfoldermanager.cpp | 4 | ||||
| -rw-r--r-- | knode/kngroupselectdialog.cpp | 2 | ||||
| -rw-r--r-- | knode/knode.h | 2 | ||||
| -rw-r--r-- | knode/knode_part.cpp | 8 | ||||
| -rw-r--r-- | knode/knode_part.h | 4 | ||||
| -rw-r--r-- | knode/smtpaccountwidget_base.ui | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 4984b69a2..e9839b994 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -115,7 +115,7 @@ bool KNFolder::readInfo(const TQString &infoPath) if (!isRootFolder() && !isStandardFolder()) { n_ame=info.readEntry("name"); i_d=info.readNumEntry("id", -1); - p_arentId=info.readNumEntry("tqparentId", -1); + p_arentId=info.readNumEntry("parentId", -1); } w_asOpen=info.readBoolEntry("wasOpen", true); @@ -147,7 +147,7 @@ void KNFolder::saveInfo() if (!isRootFolder() && !isStandardFolder()) { info.writeEntry("name", n_ame); info.writeEntry("id", i_d); - info.writeEntry("tqparentId", p_arentId); + info.writeEntry("parentId", p_arentId); } if(l_istItem) info.writeEntry("wasOpen", l_istItem->isOpen()); diff --git a/knode/knfolder.h b/knode/knfolder.h index 692e02a68..632dbc6e5 100644 --- a/knode/knfolder.h +++ b/knode/knfolder.h @@ -38,7 +38,7 @@ class KNFolder : public KNArticleCollection { //id int id() const { return i_d; } void setId(int i) { i_d=i; } - int tqparentId() const { return p_arentId; } + int parentId() const { return p_arentId; } bool isStandardFolder() { return (i_d > 0) && (i_d <=3); } bool isRootFolder() { return i_d==0; } diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index c1c2d2e8a..bdac2f2b9 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -463,11 +463,11 @@ int KNFolderManager::loadCustomFolders() delete f; } - // set tqparents + // set parents if(cnt>0) { for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) { if ( !(*it)->isRootFolder() ) { // the root folder has no tqparent - KNFolder *par = folder( (*it)->tqparentId() ); + KNFolder *par = folder( (*it)->parentId() ); if ( !par ) par = root(); (*it)->setParent( par ); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index a3328b8e0..bfd374060 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -104,7 +104,7 @@ TQString KNGroupSelectDialog::selectedGroups()const } if (moderated && (count>=2)) // warn the user - KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."), + KMessageBox::information(parentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."), TQString(),"crosspostModeratedWarning"); return ret; diff --git a/knode/knode.h b/knode/knode.h index 8d82defe6..f0dbca585 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -47,7 +47,7 @@ class KNMainWindow : public KMainWindow TQ_OBJECT public: - KNMainWindow( TQWidget* tqparentWidget=0 ); + KNMainWindow( TQWidget* parentWidget=0 ); ~KNMainWindow(); void openURL( const KURL& ); KNMainWidget *mainWidget() { return m_mainWidget; } diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 729d71f9f..1f95335e8 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -47,10 +47,10 @@ typedef KParts::GenericFactory< KNodePart > KNodeFactory; K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory ) -KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName, +KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &) : KParts::ReadOnlyPart(tqparent, name), - mParentWidget( tqparentWidget ) + mParentWidget( parentWidget ) { kdDebug(5003) << "KNodePart()" << endl; kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; @@ -67,7 +67,7 @@ KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName, knGlobals.instance = KNodeFactory::instance(); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget(tqparentWidget, widgetName); + TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); @@ -114,7 +114,7 @@ void KNodePart::guiActivateEvent(KParts::GUIActivateEvent *e) } -TQWidget* KNodePart::tqparentWidget() const +TQWidget* KNodePart::parentWidget() const { return mParentWidget; } diff --git a/knode/knode_part.h b/knode/knode_part.h index b98b8d6fa..e8883cb60 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -44,11 +44,11 @@ class KNodePart: public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KNodePart(TQWidget *tqparentWidget, const char *widgetName, + KNodePart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &); virtual ~KNodePart(); - TQWidget* tqparentWidget() const; + TQWidget* parentWidget() const; static KAboutData *createAboutData(); diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index ca6ac6c0b..b742d4dd7 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -223,7 +223,7 @@ <slot access="protected">useExternalMailerToggled(bool)</slot> <slot access="protected">loginToggled(bool)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> |