[Cmake-commits] [cmake-commits] clinton committed CMakeSetupDialog.cxx 1.62 1.63 QCMakeCacheView.cxx 1.42 1.43 QCMakeCacheView.h 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Sep 23 13:09:58 EDT 2009
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv10818
Modified Files:
CMakeSetupDialog.cxx QCMakeCacheView.cxx QCMakeCacheView.h
Log Message:
fix compile warnings
Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.62
retrieving revision 1.63
diff -C 2 -d -r1.62 -r1.63
*** CMakeSetupDialog.cxx 22 Sep 2009 22:29:35 -0000 1.62
--- CMakeSetupDialog.cxx 23 Sep 2009 17:09:55 -0000 1.63
***************
*** 287,298 ****
if(!dir.exists())
{
! QString message = tr("Build directory does not exist, "
"should I create it?")
+ "\n\n"
+ tr("Directory: ");
! message += bindir;
QString title = tr("Create Directory");
QMessageBox::StandardButton btn;
! btn = QMessageBox::information(this, title, message,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
--- 287,298 ----
if(!dir.exists())
{
! QString msg = tr("Build directory does not exist, "
"should I create it?")
+ "\n\n"
+ tr("Directory: ");
! msg += bindir;
QString title = tr("Create Directory");
QMessageBox::StandardButton btn;
! btn = QMessageBox::information(this, title, msg,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
***************
*** 381,389 ****
if(this->CacheModified)
{
! QString message = tr("You have changed options but not rebuilt, "
"are you sure you want to exit?");
QString title = tr("Confirm Exit");
QMessageBox::StandardButton btn;
! btn = QMessageBox::critical(this, title, message,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
--- 381,389 ----
if(this->CacheModified)
{
! QString msg = tr("You have changed options but not rebuilt, "
"are you sure you want to exit?");
QString title = tr("Confirm Exit");
QMessageBox::StandardButton btn;
! btn = QMessageBox::critical(this, title, msg,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
***************
*** 396,405 ****
if(this->CurrentState == Configuring)
{
! QString message = "You are in the middle of a Configure.\n"
"If you Exit now the configure information will be lost.\n"
"Are you sure you want to Exit?";
QString title = tr("Confirm Exit");
QMessageBox::StandardButton btn;
! btn = QMessageBox::critical(this, title, message,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
--- 396,405 ----
if(this->CurrentState == Configuring)
{
! QString msg = "You are in the middle of a Configure.\n"
"If you Exit now the configure information will be lost.\n"
"Are you sure you want to Exit?";
QString title = tr("Confirm Exit");
QMessageBox::StandardButton btn;
! btn = QMessageBox::critical(this, title, msg,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
***************
*** 541,554 ****
}
! void CMakeSetupDialog::error(const QString& message)
{
this->Output->setCurrentCharFormat(this->ErrorFormat);
! this->Output->append(message);
}
! void CMakeSetupDialog::message(const QString& message)
{
this->Output->setCurrentCharFormat(this->MessageFormat);
! this->Output->append(message);
}
--- 541,554 ----
}
! void CMakeSetupDialog::error(const QString& msg)
{
this->Output->setCurrentCharFormat(this->ErrorFormat);
! this->Output->append(msg);
}
! void CMakeSetupDialog::message(const QString& msg)
{
this->Output->setCurrentCharFormat(this->MessageFormat);
! this->Output->append(msg);
}
***************
*** 678,684 ****
{
QString title = tr("Delete Cache");
! QString message = "Are you sure you want to delete the cache?";
QMessageBox::StandardButton btn;
! btn = QMessageBox::information(this, title, message,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
--- 678,684 ----
{
QString title = tr("Delete Cache");
! QString msg = "Are you sure you want to delete the cache?";
QMessageBox::StandardButton btn;
! btn = QMessageBox::information(this, title, msg,
QMessageBox::Yes | QMessageBox::No);
if(btn == QMessageBox::No)
Index: QCMakeCacheView.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** QCMakeCacheView.h 10 Aug 2009 17:25:22 -0000 1.24
--- QCMakeCacheView.h 23 Sep 2009 17:09:56 -0000 1.25
***************
*** 43,47 ****
bool showAdvanced() const;
! QSize sizeHint(int) { return QSize(200,200); }
public slots:
--- 43,47 ----
bool showAdvanced() const;
! QSize sizeHint() const { return QSize(200,200); }
public slots:
Index: QCMakeCacheView.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -C 2 -d -r1.42 -r1.43
*** QCMakeCacheView.cxx 10 Aug 2009 17:25:22 -0000 1.42
--- QCMakeCacheView.cxx 23 Sep 2009 17:09:55 -0000 1.43
***************
*** 251,266 ****
qSort(newP);
qSort(newP2);
! int rowCount = 0;
foreach(QCMakeProperty p, newP)
{
! this->insertRow(rowCount);
! this->setPropertyData(this->index(rowCount, 0), p, true);
! rowCount++;
}
foreach(QCMakeProperty p, newP2)
{
! this->insertRow(rowCount);
! this->setPropertyData(this->index(rowCount, 0), p, false);
! rowCount++;
}
}
--- 251,266 ----
qSort(newP);
qSort(newP2);
! int row_count = 0;
foreach(QCMakeProperty p, newP)
{
! this->insertRow(row_count);
! this->setPropertyData(this->index(row_count, 0), p, true);
! row_count++;
}
foreach(QCMakeProperty p, newP2)
{
! this->insertRow(row_count);
! this->setPropertyData(this->index(row_count, 0), p, false);
! row_count++;
}
}
***************
*** 276,280 ****
foreach(QString key, newPropsTree.keys())
{
! QCMakePropertyList props = newPropsTree[key];
QList<QStandardItem*> parentItems;
--- 276,280 ----
foreach(QString key, newPropsTree.keys())
{
! QCMakePropertyList props2 = newPropsTree[key];
QList<QStandardItem*> parentItems;
***************
*** 287,292 ****
root->appendRow(parentItems);
! foreach(QCMakeProperty prop, props)
{
QList<QStandardItem*> items;
items.append(new QStandardItem());
--- 287,294 ----
root->appendRow(parentItems);
! int num = props2.size();
! for(int i=0; i<num; i++)
{
+ QCMakeProperty prop = props2[i];
QList<QStandardItem*> items;
items.append(new QStandardItem());
***************
*** 299,303 ****
foreach(QString key, newPropsTree2.keys())
{
! QCMakePropertyList props = newPropsTree2[key];
QStandardItem* parentItem =
--- 301,305 ----
foreach(QString key, newPropsTree2.keys())
{
! QCMakePropertyList props2 = newPropsTree2[key];
QStandardItem* parentItem =
***************
*** 305,310 ****
root->appendRow(parentItem);
! foreach(QCMakeProperty prop, props)
{
QList<QStandardItem*> items;
items.append(new QStandardItem());
--- 307,314 ----
root->appendRow(parentItem);
! int num = props2.size();
! for(int i=0; i<num; i++)
{
+ QCMakeProperty prop = props2[i];
QList<QStandardItem*> items;
items.append(new QStandardItem());
***************
*** 645,649 ****
// Issue 205903 fixed in Qt 4.5.0.
// Can remove this function and FileDialogFlag when minimum Qt version is 4.5
! bool QCMakeCacheModelDelegate::eventFilter(QObject* object, QEvent* event)
{
// workaround for what looks like a bug in Qt on Mac OS X
--- 649,653 ----
// Issue 205903 fixed in Qt 4.5.0.
// Can remove this function and FileDialogFlag when minimum Qt version is 4.5
! bool QCMakeCacheModelDelegate::eventFilter(QObject* object, QEvent* evt)
{
// workaround for what looks like a bug in Qt on Mac OS X
***************
*** 651,659 ****
// so the Qt library ends up assuming the focus was lost to something else
! if(event->type() == QEvent::FocusOut && this->FileDialogFlag)
{
return false;
}
! return QItemDelegate::eventFilter(object, event);
}
--- 655,663 ----
// so the Qt library ends up assuming the focus was lost to something else
! if(evt->type() == QEvent::FocusOut && this->FileDialogFlag)
{
return false;
}
! return QItemDelegate::eventFilter(object, evt);
}
***************
*** 700,709 ****
if(cache_model && idx.isValid())
{
! QCMakeProperty property;
idx = idx.sibling(idx.row(), 0);
! cache_model->getPropertyData(idx, property);
// clean out an old one
! QSet<QCMakeProperty>::iterator iter = mChanges.find(property);
if(iter != mChanges.end())
{
--- 704,713 ----
if(cache_model && idx.isValid())
{
! QCMakeProperty prop;
idx = idx.sibling(idx.row(), 0);
! cache_model->getPropertyData(idx, prop);
// clean out an old one
! QSet<QCMakeProperty>::iterator iter = mChanges.find(prop);
if(iter != mChanges.end())
{
***************
*** 711,715 ****
}
// now add the new item
! mChanges.insert(property);
}
}
--- 715,719 ----
}
// now add the new item
! mChanges.insert(prop);
}
}
More information about the Cmake-commits
mailing list