aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-03-03 13:22:18 -0500
committerKen Moore <ken@ixsystems.com>2017-03-03 13:22:18 -0500
commit1ca4d379cd7fc44eca71bb8c39dbf15e99ab9a6e (patch)
treeee486575a6d62d468d817db97e36a9aa65fe8c15
parentA bit more work on the new window frames. Now the minimum size policies are r... (diff)
downloadlumina-1ca4d379cd7fc44eca71bb8c39dbf15e99ab9a6e.tar.gz
lumina-1ca4d379cd7fc44eca71bb8c39dbf15e99ab9a6e.tar.bz2
lumina-1ca4d379cd7fc44eca71bb8c39dbf15e99ab9a6e.zip
Change all instances of "nullptr" to use "0" instead - fixed compilation issues on random platforms, and prevents using a possible system/OS specific setting.
-rw-r--r--src-qt5/core-utils/lumina-config/AppDialog.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src-qt5/core-utils/lumina-config/AppDialog.h b/src-qt5/core-utils/lumina-config/AppDialog.h
index 2b03fc76..6a2c03fd 100644
--- a/src-qt5/core-utils/lumina-config/AppDialog.h
+++ b/src-qt5/core-utils/lumina-config/AppDialog.h
@@ -27,7 +27,7 @@ public:
ui->setupUi(this); //load the designer file
appreset = false;
ui->listApps->clear();
- QListWidgetItem *defaultItem = nullptr;
+ QListWidgetItem *defaultItem = 0;
QList<XDGDesktop*> APPS = LXDG::sortDesktopNames(APPSLIST->apps(false,false)); //Don't show all/hidden
for(int i=0; i<APPS.length(); i++){
QListWidgetItem *app = new QListWidgetItem(LXDG::findIcon(APPS[i]->icon,"application-x-executable"), APPS[i]->name);
@@ -38,7 +38,7 @@ public:
}
}
if(ui->listApps->count()){
- ui->listApps->setCurrentItem(defaultItem != nullptr ? defaultItem : ui->listApps->item(0));
+ ui->listApps->setCurrentItem(defaultItem != 0 ? defaultItem : ui->listApps->item(0));
}
this->setWindowIcon( LXDG::findIcon("system-search","") );
if(parent!=0){
@@ -66,7 +66,7 @@ public:
private slots:
void on_buttonBox_accepted(){
QListWidgetItem *item = ui->listApps->currentItem();
- if(item != nullptr){
+ if(item != 0){
appselected = item->data(Qt::UserRole).toString();
}
this->close();
@@ -85,18 +85,18 @@ private slots:
this->close();
}
void on_lineSearch_textChanged(const QString &term){
- QListWidgetItem *first_visible = nullptr;
+ QListWidgetItem *first_visible = 0;
for(int i = 0; i < ui->listApps->count(); i++){
QListWidgetItem *item = ui->listApps->item(i);
bool visible = item->text().contains(term, Qt::CaseInsensitive);
item->setHidden(!visible);
- if(visible && first_visible == nullptr){
+ if(visible && first_visible == 0){
first_visible = item;
}
}
//Select the first app
ui->listApps->setCurrentItem(first_visible);
- if(first_visible != nullptr){
+ if(first_visible != 0){
ui->listApps->scrollToItem(first_visible);
}
}
bgstack15