Drop support for PySide

It's no longer developed and I'm moving to Qt5 which
is not supported
This commit is contained in:
Salvo 'LtWorf' Tomaselli
2015-02-18 17:53:02 +01:00
parent 32f7aa5410
commit da4c549ea0
17 changed files with 20 additions and 654 deletions

View File

@@ -18,22 +18,13 @@
# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
import os
from PyQt4 import QtCore, QtGui
try:
from PyQt4 import QtCore, QtGui
try: # If QtWebKit is available, uses it
from PyQt4 import QtWebKit
webk = True
except:
webk = False
try: # If QtWebKit is available, uses it
from PyQt4 import QtWebKit
webk = True
except:
from PySide import QtCore, QtGui
try: # If QtWebKit is available, uses it
from PySide import QtWebKit
webk = True
except:
webk = False
webk = False
version = 0

View File

@@ -19,45 +19,22 @@
#
# Module to unify the use of both pyqt and pyside
try:
from PyQt4 import QtCore, QtGui
pyqt = True
except:
from PySide import QtCore, QtGui
pyqt = False
from PyQt4 import QtCore, QtGui
def get_py_str(a):
'''Returns a python string out of a QString'''
if pyqt:
return unicode(a.toUtf8(), 'utf-8')
return a # Already a python string in PySide
return unicode(a.toUtf8(), 'utf-8')
def set_utf8_text(component, text):
if not pyqt:
component.setText(text)
else:
component.setText(QtCore.QString.fromUtf8(text))
component.setText(QtCore.QString.fromUtf8(text))
def get_filename(filename):
if pyqt:
return str(filename.toUtf8())
return filename[0]
return str(filename.toUtf8())
def add_list_item(l, item):
if pyqt:
history_item = QtCore.QString()
history_item.append(item)
hitem = QtGui.QListWidgetItem(None, 0)
hitem.setText(history_item)
l.addItem(hitem)
l.setCurrentItem(hitem)
else:
hitem = QtGui.QListWidgetItem(None, 0)
hitem.setText(item)
l.addItem(hitem)
l.setCurrentItem(hitem)
history_item = QtCore.QString()
history_item.append(item)
hitem = QtGui.QListWidgetItem(None, 0)
hitem.setText(history_item)
l.addItem(hitem)
l.setCurrentItem(hitem)

View File

@@ -18,13 +18,8 @@
# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
import sys
import os
import pickle
try:
from PyQt4 import QtCore, QtGui
except:
from PySide import QtCore, QtGui
from PyQt4 import QtCore, QtGui
from relational import relation, parser, optimizer, rtypes

View File

@@ -16,10 +16,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
try:
from PyQt4 import QtCore, QtGui
except:
from PySide import QtCore, QtGui
from PyQt4 import QtCore, QtGui
import compatibility
from relational import maintenance