summaryrefslogtreecommitdiffstats
path: root/kmail/kmfolderdia.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kmail/kmfolderdia.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmfolderdia.cpp')
-rw-r--r--kmail/kmfolderdia.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 533173e5e..4e17ce235 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -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::AcceptStatus s = mTabs[i]->accept();
+ FolderDiaTab::AccepStatus 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;