diff options
| author | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
| commit | 24f84a489364741eb3fc126a3f83d91a86b65e27 (patch) | |
| tree | 63a4e20aaf4a2ebd2462c91b574eddceeac31170 /muse2/synti/deicsonze/deicsonzegui.cpp | |
| parent | 38c5cccc7273247353264bb7dc97f42296d8e259 (diff) | |
| parent | 2120ea4f083228dde0d7307203391a4ec8f57e2d (diff) | |
merged the first bunch of orcans changes
STILL WAIT WITH COMMITTING NEW STUFF! i have to merge the rest as well!
this is a bit buggy (connect errors, not tested much), but doesn't
segfault immediately
Diffstat (limited to 'muse2/synti/deicsonze/deicsonzegui.cpp')
| -rw-r--r-- | muse2/synti/deicsonze/deicsonzegui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp index 4cb78764..b88a47fc 100644 --- a/muse2/synti/deicsonze/deicsonzegui.cpp +++ b/muse2/synti/deicsonze/deicsonzegui.cpp @@ -23,8 +23,8 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA or point your web browser to http://www.gnu.org. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +// 02111-1301, USA or point your web browser to http://www.gnu.org. //=========================================================================== #include <QDir> @@ -418,7 +418,7 @@ DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze) QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read); connect(s, SIGNAL(activated(int)), SLOT(readMessage(int))); - QString sharePath(museGlobalShare); + QString sharePath(MusEGlobal::museGlobalShare); // Tim. updateInitSetPath(sharePath + QString("/presets/deicsonze/SutulaBank.dei")); // Tim. updateBackgroundPixPath(sharePath + QString("/wallpapers/paper2.jpg")); // Tim. @@ -555,7 +555,7 @@ void DeicsOnzeGui::saveConfiguration() { // saveDefaultConfiguration //----------------------------------------------------------- void DeicsOnzeGui::saveDefaultConfiguration() { - QString filename = configPath + QString("/" DEICSONZESTR ".dco"); + QString filename = MusEGlobal::configPath + QString("/" DEICSONZESTR ".dco"); if(!filename.isEmpty()) { QFile f(filename); f.open(QIODevice::WriteOnly); |