diff options
| -rw-r--r-- | src/QMenuModel/plugin.cpp | 19 | ||||
| -rw-r--r-- | src/QMenuModel/plugin.h | 19 | ||||
| -rw-r--r-- | src/common/qdbusactiongroup.cpp | 19 | ||||
| -rw-r--r-- | src/common/qdbusactiongroup.h | 19 | ||||
| -rw-r--r-- | src/common/qdbusmenumodel.cpp | 19 | ||||
| -rw-r--r-- | src/common/qdbusmenumodel.h | 19 | ||||
| -rw-r--r-- | src/common/qdbusobject.cpp | 21 | ||||
| -rw-r--r-- | src/common/qdbusobject.h | 19 | ||||
| -rw-r--r-- | src/common/qmenumodel.cpp | 22 | ||||
| -rw-r--r-- | src/common/qmenumodel.h | 19 | ||||
| -rw-r--r-- | tests/client/menuchangestest.cpp | 19 | ||||
| -rw-r--r-- | tests/client/modeltest.cpp | 19 | ||||
| -rw-r--r-- | tests/client/servicetest.cpp | 21 | ||||
| -rw-r--r-- | tests/script/dbusmenuscript.cpp | 18 | ||||
| -rw-r--r-- | tests/script/dbusmenuscript.h | 19 |
15 files changed, 284 insertions, 7 deletions
diff --git a/src/QMenuModel/plugin.cpp b/src/QMenuModel/plugin.cpp index 4b5b18e..9fd7922 100644 --- a/src/QMenuModel/plugin.cpp +++ b/src/QMenuModel/plugin.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "plugin.h" #include "qmenumodel.h" #include "qdbusmenumodel.h" diff --git a/src/QMenuModel/plugin.h b/src/QMenuModel/plugin.h index 9346d32..e9d6850 100644 --- a/src/QMenuModel/plugin.h +++ b/src/QMenuModel/plugin.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef QMENUMODELQMLPLUGIN_H #define QMENUMODELQMLPLUGIN_H diff --git a/src/common/qdbusactiongroup.cpp b/src/common/qdbusactiongroup.cpp index 8475c29..51bc4ac 100644 --- a/src/common/qdbusactiongroup.cpp +++ b/src/common/qdbusactiongroup.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusactiongroup.h" #include <QDebug> diff --git a/src/common/qdbusactiongroup.h b/src/common/qdbusactiongroup.h index fe743b6..4ae0074 100644 --- a/src/common/qdbusactiongroup.h +++ b/src/common/qdbusactiongroup.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef QDBUSACTIONGROUP_H #define QDBUSACTIONGROUP_H diff --git a/src/common/qdbusmenumodel.cpp b/src/common/qdbusmenumodel.cpp index 6e35c85..cae1288 100644 --- a/src/common/qdbusmenumodel.cpp +++ b/src/common/qdbusmenumodel.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusmenumodel.h" #include <QDebug> diff --git a/src/common/qdbusmenumodel.h b/src/common/qdbusmenumodel.h index 4fc439d..14ac4a2 100644 --- a/src/common/qdbusmenumodel.h +++ b/src/common/qdbusmenumodel.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef QDBUSMENUMODEL_H #define QDBUSMENUMODEL_H diff --git a/src/common/qdbusobject.cpp b/src/common/qdbusobject.cpp index 6dec6d9..174a9d8 100644 --- a/src/common/qdbusobject.cpp +++ b/src/common/qdbusobject.cpp @@ -1,9 +1,26 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusobject.h" #include <QDebug> - - QDBusObject::QDBusObject() :m_watchId(0), m_busType(None), diff --git a/src/common/qdbusobject.h b/src/common/qdbusobject.h index a2dc91c..c50d540 100644 --- a/src/common/qdbusobject.h +++ b/src/common/qdbusobject.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef QDBUSOBJECT_H #define QDBUSOBJECT_H diff --git a/src/common/qmenumodel.cpp b/src/common/qmenumodel.cpp index 6e7483c..230365c 100644 --- a/src/common/qmenumodel.cpp +++ b/src/common/qmenumodel.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qmenumodel.h" #include <QDebug> @@ -43,7 +62,6 @@ void QMenuModel::setMenuModel(GMenuModel *other) if (m_menuModel) { // this will trigger the menu load (void) g_menu_model_get_n_items(m_menuModel); - //qDebug() << "Menu size:" << g_menu_model_get_n_items(m_menuModel); m_signalChangedId = g_signal_connect(m_menuModel, "items-changed", G_CALLBACK(QMenuModel::onItemsChanged), @@ -152,7 +170,6 @@ QVariant QMenuModel::getExtraProperties(const QModelIndex &index) const const gchar *attrName = NULL; GVariant *value = NULL; while (g_menu_attribute_iter_get_next (iter, &attrName, &value)) { - qDebug() << "Set property:" << attrName; if (strncmp("x-", attrName, 2) == 0) { extra->setProperty(attrName, parseGVariant(value)); } @@ -169,7 +186,6 @@ void QMenuModel::onItemsChanged(GMenuModel *, gpointer data) { QMenuModel *self = reinterpret_cast<QMenuModel*>(data); - //qDebug() << "Item Changed" << position << removed << added; if (removed > 0) { self->beginRemoveRows(QModelIndex(), position, position + removed - 1); diff --git a/src/common/qmenumodel.h b/src/common/qmenumodel.h index f1e0b61..e594ea7 100644 --- a/src/common/qmenumodel.h +++ b/src/common/qmenumodel.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef QMENUMODEL_H #define QMENUMODEL_H diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp index 7e6379c..c2dc66a 100644 --- a/tests/client/menuchangestest.cpp +++ b/tests/client/menuchangestest.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index 1963327..9c092f1 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp index 3faddd0..cc47334 100644 --- a/tests/client/servicetest.cpp +++ b/tests/client/servicetest.cpp @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -33,7 +52,6 @@ private Q_SLOTS: void init() { - qDebug() << "init>>>>>>>>>>>>>>>>>>>>>"; m_model.stop(); m_model.setBusType(QDBusObject::SessionBus); m_model.setBusName(MENU_SERVICE_NAME); @@ -42,7 +60,6 @@ private Q_SLOTS: void cleanup() { - qDebug() << "cleanup>>>>>>>>>>>>>>>>>>"; m_script.unpublishMenu(); } diff --git a/tests/script/dbusmenuscript.cpp b/tests/script/dbusmenuscript.cpp index cc332f7..baf5ac2 100644 --- a/tests/script/dbusmenuscript.cpp +++ b/tests/script/dbusmenuscript.cpp @@ -1,3 +1,21 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ #include "dbusmenuscript.h" #include <QObject> diff --git a/tests/script/dbusmenuscript.h b/tests/script/dbusmenuscript.h index 3d0d3c9..6e9532b 100644 --- a/tests/script/dbusmenuscript.h +++ b/tests/script/dbusmenuscript.h @@ -1,3 +1,22 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Renato Araujo Oliveira Filho <renato@canonical.com> + */ + #ifndef DBUSMENUSCRIPT_H #define DBUSMENUSCRITP_H |