cleaned some warnings
This commit is contained in:
parent
0508fb3627
commit
6f4e49bb47
@ -277,14 +277,14 @@ void QtButtonPropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBr
|
|||||||
if (!parentItem->container) {
|
if (!parentItem->container) {
|
||||||
m_recreateQueue.removeAll(parentItem);
|
m_recreateQueue.removeAll(parentItem);
|
||||||
WidgetItem *grandParent = parentItem->parent;
|
WidgetItem *grandParent = parentItem->parent;
|
||||||
QWidget *w = 0;
|
//QWidget *w = 0;
|
||||||
QGridLayout *l = 0;
|
QGridLayout *l = 0;
|
||||||
const int oldRow = gridRow(parentItem);
|
const int oldRow = gridRow(parentItem);
|
||||||
if (grandParent) {
|
if (grandParent) {
|
||||||
w = grandParent->container;
|
//w = grandParent->container;
|
||||||
l = grandParent->layout;
|
l = grandParent->layout;
|
||||||
} else {
|
} else {
|
||||||
w = q_ptr;
|
//w = q_ptr;
|
||||||
l = m_mainLayout;
|
l = m_mainLayout;
|
||||||
}
|
}
|
||||||
QFrame *container = new QFrame();
|
QFrame *container = new QFrame();
|
||||||
|
@ -312,15 +312,15 @@ void QtGroupBoxPropertyBrowserPrivate::propertyRemoved(QtBrowserItem *index)
|
|||||||
removeRow(parentItem->layout, row);
|
removeRow(parentItem->layout, row);
|
||||||
} else {
|
} else {
|
||||||
WidgetItem *par = parentItem->parent;
|
WidgetItem *par = parentItem->parent;
|
||||||
QWidget *w = 0;
|
//QWidget *w = 0;
|
||||||
QGridLayout *l = 0;
|
QGridLayout *l = 0;
|
||||||
int oldRow = -1;
|
int oldRow = -1;
|
||||||
if (!par) {
|
if (!par) {
|
||||||
w = q_ptr;
|
//w = q_ptr;
|
||||||
l = m_mainLayout;
|
l = m_mainLayout;
|
||||||
oldRow = m_children.indexOf(parentItem);
|
oldRow = m_children.indexOf(parentItem);
|
||||||
} else {
|
} else {
|
||||||
w = par->groupBox;
|
//w = par->groupBox;
|
||||||
l = par->layout;
|
l = par->layout;
|
||||||
oldRow = par->children.indexOf(parentItem);
|
oldRow = par->children.indexOf(parentItem);
|
||||||
if (hasHeader(par))
|
if (hasHeader(par))
|
||||||
|
@ -1874,14 +1874,14 @@ QtBrowserItem *QtAbstractPropertyBrowser::insertProperty(QtProperty *property,
|
|||||||
QList<QtProperty *> pendingList = properties();
|
QList<QtProperty *> pendingList = properties();
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
int newPos = 0;
|
int newPos = 0;
|
||||||
QtProperty *properAfterProperty = 0;
|
//QtProperty *properAfterProperty = 0;
|
||||||
while (pos < pendingList.count()) {
|
while (pos < pendingList.count()) {
|
||||||
QtProperty *prop = pendingList.at(pos);
|
QtProperty *prop = pendingList.at(pos);
|
||||||
if (prop == property)
|
if (prop == property)
|
||||||
return 0;
|
return 0;
|
||||||
if (prop == afterProperty) {
|
if (prop == afterProperty) {
|
||||||
newPos = pos + 1;
|
newPos = pos + 1;
|
||||||
properAfterProperty = afterProperty;
|
//properAfterProperty = afterProperty;
|
||||||
}
|
}
|
||||||
pos++;
|
pos++;
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ int log_verbose_level;
|
|||||||
std::string log_last_error;
|
std::string log_last_error;
|
||||||
void (*log_error_atexit)() = NULL;
|
void (*log_error_atexit)() = NULL;
|
||||||
|
|
||||||
static bool next_print_log = false;
|
//static bool next_print_log = false;
|
||||||
static int log_newline_count = 0;
|
static int log_newline_count = 0;
|
||||||
|
|
||||||
std::string vstringf(const char *fmt, va_list ap)
|
std::string vstringf(const char *fmt, va_list ap)
|
||||||
|
@ -127,7 +127,7 @@ void PythonTab::editLineReturnPressed(QString text)
|
|||||||
{
|
{
|
||||||
std::string input = text.toStdString();
|
std::string input = text.toStdString();
|
||||||
print(std::string(">>> " + input + "\n"));
|
print(std::string(">>> " + input + "\n"));
|
||||||
int error = executePython(input);
|
executePython(input);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PythonTab::showContextMenu(const QPoint &pt)
|
void PythonTab::showContextMenu(const QPoint &pt)
|
||||||
|
Loading…
Reference in New Issue
Block a user