diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2006-01-07 23:58:07 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-01-07 23:58:07 +0000 |
commit | 60000cbea04b55950a88700409b019b6db8541de (patch) | |
tree | 85574752ab7756d9cbc2f6255419eeb5c6f94502 /print/scribus/files | |
parent | 8d585117a82353af5381b73609166129c66be88f (diff) |
Notes
Diffstat (limited to 'print/scribus/files')
-rw-r--r-- | print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp | 20 | ||||
-rw-r--r-- | print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp | 11 |
2 files changed, 0 insertions, 31 deletions
diff --git a/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp b/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp deleted file mode 100644 index 797f1fff526b..000000000000 --- a/print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- scribus/plugins/scriptplugin/macro.cpp.orig Sun Jul 3 16:34:04 2005 -+++ scribus/plugins/scriptplugin/macro.cpp Mon Jul 4 13:10:49 2005 -@@ -53,7 +53,7 @@ - { - assert(!PyErr_Occurred()); - -- if ((newName == QString::null) or (newName == "")) -+ if ((newName == QString::null) || (newName == "")) - qDebug("Macro::Macro() called with NULL or '' name"); - - // set the macro name -@@ -344,7 +344,7 @@ - // Must not return with an exception set - void Macro::setMacroName(QString newName) - { -- if ((newName == QString::null) or (newName == "")) -+ if ((newName == QString::null) || (newName == "")) - { - qDebug("Macro::setMacroName(): called with NULL or '' name"); - return; diff --git a/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp b/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp deleted file mode 100644 index 6b49503b8c6e..000000000000 --- a/print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- scribus/plugins/short-words/vlnadialog.cpp.orig Wed Feb 2 05:02:38 2005 -+++ scribus/plugins/short-words/vlnadialog.cpp Mon Jul 4 13:18:50 2005 -@@ -159,7 +159,7 @@ - - void VlnaDialog::selectAction(int aAction) - { -- if (aAction!=0 and aAction!=1 and aAction!=2) { -+ if (aAction!=0 && aAction!=1 && aAction!=2) { - aAction = 0; - } - buttonGroup->setButton(aAction); |