diff options
Diffstat (limited to 'kmail/kmfolderdia.cpp')
| -rw-r--r-- | kmail/kmfolderdia.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 3115aef33..d10e8cfac 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -61,7 +61,7 @@ #include <kpushbutton.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqregexp.h> #include <tqlabel.h> @@ -72,7 +72,7 @@ #include <assert.h> #include <tqhbuttongroup.h> #include <tqradiobutton.h> -#include <textedit.h> +#include <tqtextedit.h> #include "templatesconfiguration.h" #include "templatesconfiguration_kfg.h" @@ -100,7 +100,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folders; - // get all folders but search and folders that can not have children + // get all folders but search and folders that can not have tqchildren aParent->createFolderList(&folderNames, &folders, true, true, true, false, true, false); @@ -185,7 +185,7 @@ void KMFolderDialog::slotOk() mDelayedSavingTabs = 0; // number of tabs which need delayed saving for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) { - FolderDiaTab::AccepStatus s = mTabs[i]->accept(); + FolderDiaTab::AcceptqStatus s = mTabs[i]->accept(); if ( s == FolderDiaTab::Canceled ) { slotCancelAccept(); return; @@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* layout ) +static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) { TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); line->setFrameShape( TQFrame::HLine ); - layout->addWidget( line ); + tqlayout->addWidget( line ); } //---------------------------------------------------------------------------- @@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") ); if (!aName.isEmpty()) mNameEdit->setText(aName); - mNameEdit->setMinimumSize(mNameEdit->sizeHint()); + mNameEdit->setMinimumSize(mNameEdit->tqsizeHint()); // prevent renaming of IMAP inbox if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) { TQString imapPath; @@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, addLine( this, topLayout ); - // use grid layout for the following combobox settings + // use grid tqlayout for the following combobox settings TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() ); gl->setColStretch( 1, 100 ); // make the second column use all available space int row = -1; |