Attachment #211965 for bug #382703

View | Details | Raw Unified | Return to bug 382703
Collapse All | Expand All




	//! concerning the type of the pointer device
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Device");
}

	//! return the driver used for this pointer device
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Driver");
}

	//! return the protocol used for this pointer device
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Protocol");
}

	//! (bool options) the value for the key is the (null) string
	// ----
	if (! mImport) {
		Q3Dict<QString>* nope = new Q3Dict<QString>;
		return *nope;
	}
	Q3Dict<QString> result;
	QString stdOptions = mImport -> getItem ("Option");

	//! return the CDB model name of this tablet
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Name");
}

	//! return the CDB vendor name of this tablet
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Vendor");
}

	//! can be: cursor,stylus or eraser
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("TabletType");
}

	//! can be either Absolute or Relative
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("TabletMode");	
}

	if (opts.isEmpty()) {
		excCDBRecordNotFound (driver);
		qError (errorString(),EXC_CDBRECORDNOTFOUND);
		Q3Dict<QString>* nope = new Q3Dict<QString>;
		return *nope;
	}
	mCDBTabletOptions = *opts.at(0);
	return mCDBTabletOptions;

	//! separated by a semi-colon
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	QString name = mImport -> getItem ("Name");
	QStringList vnlist = QStringList::split ( ";", name );

	//! separated by a semi-colon
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	QString name = mImport -> getItem ("Name");
	QStringList vnlist = QStringList::split ( ";", name );

	//! is handled with the same key: TabletType
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("TabletType");
}




	//! to the current data record
	// ----
	if (! mData.at (mCurrentID) -> operator[] (key)) {
		QString* nope = new QString;
		return *nope;
	}
	return *mData.at (mCurrentID) -> operator[] (key);
}

	if (mData.at (id)) {
		return *mData.at (id);
	} else {
		Q3Dict<QString>* nope = new Q3Dict<QString>;
		return *nope;
	}
}





	//! method will return an empty QString
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	//===================================
	// Check SaXMeta data...

	SaXImportSysp* pCard = new SaXImportSysp (SYSP_CARD);
	pCard -> doImport();
	if (! pCard -> setID ( mDesktopID )) {
		QString* nope = new QString;
		return *nope;
	}
	QString mCardName;
	QTextOStream (&mCardName) <<

	//------------------------------------
	excEmptyCDBGroup ( mCardName.latin1() );
	qError (errorString(),EXC_EMPTYCDBGROUP);
	QString* nope = new QString;
	return *nope;
}

//====================================

	//! color an empty list is returned
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString modes;
	modes.sprintf ("Modes:%d",color);
	QString resolutions = mDesktop -> getItem (modes);
	if (resolutions.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result;
	QStringList resList = QStringList::split ( ",", resolutions );

	//! the resolution
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> defaultList;
	defaultList.append (QString("800x600"));

	desktop -> setID    ( mDesktopID );
	desktop -> doImport ();
	if ( desktop->getItem(key).isNull()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	if ((key != "FBBoot") && (desktop->getItem("DDC") == "<undefined>")) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString val = desktop->getItem(key);
	QStringList items = QStringList::split ( ",", val );

	//! returned
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString size = mDesktop -> getItem ("DisplaySize");
	if (size.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result;
	QStringList sizeList = QStringList::split ( " ", size );

	//! from the getDisplaySize() method
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	QList<QString> size = getDisplaySize();
	if (size.isEmpty()) {
		QString* nope = new QString;
		return *nope;
	}
	int x = size.at(0).toInt();
	int y = size.at(1).toInt();

	//! information from the getDisplaySize() method
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString* setX = new QString ("4");
	QString* setY = new QString ("3");
	QList<QString> result;
	QList<QString> size = getDisplaySize();
	if (size.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	int x = size.at(0).toInt();
	int y = size.at(1).toInt();

	//! value specify the end of the range
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString range = mDesktop -> getItem ("HorizSync");
	if (range.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result;
	QStringList rangeList = QStringList::split ( "-", range );

	//! value specify the end of the range
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString range = mDesktop -> getItem ("VertRefresh");
	if (range.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result;
	QStringList rangeList = QStringList::split ( "-", range );

	//! currently selected desktop
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	return mDesktop -> getItem ("VendorName");
}

	//! currently selected desktop
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	return mDesktop -> getItem ("ModelName");
}

	//! the active desktop
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	return mDesktop -> getItem ("ColorDepth");
}

	//! get the currently used modeline algorithm method
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	return mDesktop -> getItem ("CalcAlgorithm");
}

	//! string is returned
	// ----
	if ((! mDesktop) || (! mCard) || (! mPath)) {
		QString* nope = new QString;
		return *nope;
	}
	QString key;
	QString val;
	key.sprintf ("Virtual:%d",color);
	val = mDesktop -> getItem (key);
	if (val.isEmpty()) {
		QString* nope = new QString;
		return *nope;
	}
	QStringList resList = QStringList::split ( " ", val );
	QString result (resList.join("x"));




	// ----
	SaXManipulateCard cardData (mCard);
	if (! cardData.selectCard (screen)) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString idString; idString.sprintf ("%d",screen);
	QString layout = mLayout -> getItem (

	if (layout.isEmpty()) {
		excGetScreenLayoutFailed (screen);
		qError (errorString(),EXC_GETSCREENLAYOUTFAILED);
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> layoutList;
	QStringList positions = QStringList::split ( " ", layout );

	if (layout.isEmpty()) {
		excGetInputLayoutFailed ();
		qError (errorString(),EXC_GETINPUTLAYOUTFAILED);
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> inputList;
	QStringList tokens = QStringList::split ( ",", layout );

Lines 59-65 Link Here

(-)libsax/file.cpp (-1 / +2 lines)
59	//! with a "#" are allowed	59	//! with a "#" are allowed
60	// ----	60	// ----
61	if (! mHandle -> isOpen()) {	61	if (! mHandle -> isOpen()) {
62	return Q3Dict<QString>();	62	Q3Dict<QString>* nope = new Q3Dict<QString>;
		63	return *nope;
63	}	64	}
64	char line[MAX_LINE_LENGTH];	65	char line[MAX_LINE_LENGTH];
65	while ((mHandle->readLine(line,MAX_LINE_LENGTH)) != 0) {	66	while ((mHandle->readLine(line,MAX_LINE_LENGTH)) != 0) {




	//! this X11 configuration
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString paths = mImport -> getItem ("FontPath");
	return createList (paths);

	//! X11 configuration
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString modules = mImport -> getItem ("ModuleLoad");
	return createList (modules);

	//! X11 configuration
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString modules = mImport -> getItem ("ServerFlags");
	return createList (modules);

	//! empty items will be ignored using this method
	// ----
	if (data.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result; 
	QStringList dataList = QStringList::split ( ",", data );




	//! given baselayout.
	// ----
	if ( layout.isEmpty() || ! getLayouts().find(layout) ) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result1;
	QStringList* r1 = mVarLists[layout];

	//! return the driver used for this keyboard device
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Driver");
}

	//! return a list of XKB options set for the core keyboard
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString options = mImport -> getItem ("XkbOptions");
	return createList (options);

	//! the first element of the list os the core layout
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString layouts = mImport -> getItem ("XkbLayout");
	return createList (layouts);

	//! defined keyboard layouts
	// ----
	if (! mImport) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QString variants = mImport -> getItem ("XkbVariant");
	return createList (variants);

	//! be throwed and an empty string is returned
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	int layoutCount = findLayout (layout);
	if (layoutCount < 0) {
		excXKBLayoutUndefined (layout);
		qError (errorString(),EXC_XKBLAYOUTUNDEFINED);
		QString* nope = new QString;
		return *nope;
	}
	int varCount = 0;
	QList<QString> vList = getXKBVariantList();

		}
		varCount++;
	}
	QString* nope = new QString;
	return *nope;
}

//====================================

	//! keyboard. Only one model can be defined and active
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("XkbModel");
}

	//! empty items (,,) are allowed using this method
	// ----
	if (data.isEmpty()) {
		QList<QString>* nope = new QList<QString>;
		return *nope;
	}
	QList<QString> result; 
	QStringList dataList = QStringList::split ( ",", data, true );




	//! error occured an empty string is returned
	// ----
	if (mParseErrorValue->isEmpty()) {
		QString* nope = new QString("");
		return *nope;
	}
	return *mParseErrorValue;
}

	//! error occured an empty string is returned
	// ----
	if (mParseErrorString->isEmpty()) {
		QString* nope = new QString("");
		return *nope;
	}
	return *mParseErrorString;
}




	//! separated by a colon from the currently selected card
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	//====================================
	// search name in SYSP data

	//! interface
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	//====================================
	// search vendor in SYSP data

	//! interface
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	//====================================
	// search model in SYSP data

	//! selected card
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("BusID");
}

	//! selected card
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Driver");
}

	//! selected card. This value is always 0 for non multihead cards
	// ----
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Screen");
}

	//! empty QString is returned
	// ---- 
	if (! mImport) {
		QString* nope = new QString;
		return *nope;
	}
	return mImport -> getItem ("Rotate");
}

	//! (bool options) the value for the key is the (null) string
	// ----
	if (! mImport) {
		Q3Dict<QString>* nope = new Q3Dict<QString>;
		return *nope;
	}
	Q3Dict<QString> result;
	QString stdOptions = mImport -> getItem ("Option");

	if (opts.isEmpty()) {
		excCDBRecordNotFound (driver);
		qError (errorString(),EXC_CDBRECORDNOTFOUND);
		Q3Dict<QString>* nope = new Q3Dict<QString>;
		return *nope;
	}
	Q3PtrList< Q3Dict<QString> > xaaopts;
	xaaopts = mCDBCardModules -> getTablePointerCDB_DATA (

Lines 1-4 Link Here

(-)rpm/sax2.changes (+6 lines)
1	-------------------------------------------------------------------	1	-------------------------------------------------------------------
		2	Fri May 2 14:05:33 CEST 2008 - ms@suse.de
		3
		4	- fixed libsax and xapi object return values according
		5	to qt3 -> qt4 changes (bnc #382703)
		6
		7	-------------------------------------------------------------------
2	Tue Apr 29 09:47:23 CEST 2008 - ms@suse.de	8	Tue Apr 29 09:47:23 CEST 2008 - ms@suse.de
3		9
4	- update hwinfo source, monitors added (bnc #373997)	10	- update hwinfo source, monitors added (bnc #373997)

Lines 278-284 Link Here

(-)api/vnc/vncdisplay.cpp (-1 / +2 lines)
278	if (mCheckPWD -> isOn()) {	278	if (mCheckPWD -> isOn()) {
279	return mPWD1->text();	279	return mPWD1->text();
280	}	280	}
281	return QString();	281	QString* nope = new QString;
		282	return *nope;
282	}	283	}
283	//====================================	284	//====================================
284	// slotActivateVNC	285	// slotActivateVNC




	if (mVendorList->selectedItem()) {
		return mVendorList->selectedItem()->text();
	}
	QString* nope = new QString;
	return *nope;
}
//====================================
// getModel

	if (mModelList->selectedItem()) {
		return mModelList->selectedItem()->text();
	}
	QString* nope = new QString;
	return *nope;
}
//====================================
// slotVendor




	if (mVendorList->selectedItem()) {
		return mVendorList->selectedItem()->text();
	}
	QString* nope = new QString;
	return *nope;
}
//====================================
// getModel

	if (mModelList->selectedItem()) {
		return mModelList->selectedItem()->text();
	}
	QString* nope = new QString;
	return *nope;
}
//====================================
// getPortName

Lines 43-49 Link Here

(-)api/wrapper.h (-1 / +2 lines)
43	if (pM->operator[](key)) {	43	if (pM->operator[](key)) {
44	return(QString::fromLocal8Bit( *pM->operator[](key) ));	44	return(QString::fromLocal8Bit( *pM->operator[](key) ));
45	}	45	}
46	return QString("");	46	QString* nope = new QString;
		47	return *nope;
47	}	48	}
48	void insert (const QString & key,QString* val) {	49	void insert (const QString & key,QString* val) {
49	pM->insert (key,val);	50	pM->insert (key,val);

Return to bug 382703

Lines 229-235 Link Here

(-)libsax/pointers.cpp (-12 / +24 lines)
229	//! concerning the type of the pointer device	229	//! concerning the type of the pointer device
230	// ----	230	// ----
231	if (! mImport) {	231	if (! mImport) {
232	return QString();	232	QString* nope = new QString;
		233	return *nope;
233	}	234	}
234	return mImport -> getItem ("Device");	235	return mImport -> getItem ("Device");
235	}	236	}
Lines 242-248 Link Here
242	//! return the driver used for this pointer device	243	//! return the driver used for this pointer device
243	// ----	244	// ----
244	if (! mImport) {	245	if (! mImport) {
245	return QString();	246	QString* nope = new QString;
		247	return *nope;
246	}	248	}
247	return mImport -> getItem ("Driver");	249	return mImport -> getItem ("Driver");
248	}	250	}
Lines 255-261 Link Here
255	//! return the protocol used for this pointer device	257	//! return the protocol used for this pointer device
256	// ----	258	// ----
257	if (! mImport) {	259	if (! mImport) {
258	return QString();	260	QString* nope = new QString;
		261	return *nope;
259	}	262	}
260	return mImport -> getItem ("Protocol");	263	return mImport -> getItem ("Protocol");
261	}	264	}
Lines 272-278 Link Here
272	//! (bool options) the value for the key is the (null) string	275	//! (bool options) the value for the key is the (null) string
273	// ----	276	// ----
274	if (! mImport) {	277	if (! mImport) {
275	return Q3Dict<QString>();	278	Q3Dict<QString>* nope = new Q3Dict<QString>;
		279	return *nope;
276	}	280	}
277	Q3Dict<QString> result;	281	Q3Dict<QString> result;
278	QString stdOptions = mImport -> getItem ("Option");	282	QString stdOptions = mImport -> getItem ("Option");
Lines 963-969 Link Here
963	//! return the CDB model name of this tablet	967	//! return the CDB model name of this tablet
964	// ----	968	// ----
965	if (! mImport) {	969	if (! mImport) {
966	return QString();	970	QString* nope = new QString;
		971	return *nope;
967	}	972	}
968	return mImport -> getItem ("Name");	973	return mImport -> getItem ("Name");
969	}	974	}
Lines 976-982 Link Here
976	//! return the CDB vendor name of this tablet	981	//! return the CDB vendor name of this tablet
977	// ----	982	// ----
978	if (! mImport) {	983	if (! mImport) {
979	return QString();	984	QString* nope = new QString;
		985	return *nope;
980	}	986	}
981	return mImport -> getItem ("Vendor");	987	return mImport -> getItem ("Vendor");
982	}	988	}
Lines 990-996 Link Here
990	//! can be: cursor,stylus or eraser	996	//! can be: cursor,stylus or eraser
991	// ----	997	// ----
992	if (! mImport) {	998	if (! mImport) {
993	return QString();	999	QString* nope = new QString;
		1000	return *nope;
994	}	1001	}
995	return mImport -> getItem ("TabletType");	1002	return mImport -> getItem ("TabletType");
996	}	1003	}
Lines 1004-1010 Link Here
1004	//! can be either Absolute or Relative	1011	//! can be either Absolute or Relative
1005	// ----	1012	// ----
1006	if (! mImport) {	1013	if (! mImport) {
1007	return QString();	1014	QString* nope = new QString;
		1015	return *nope;
1008	}	1016	}
1009	return mImport -> getItem ("TabletMode");	1017	return mImport -> getItem ("TabletMode");
1010	}	1018	}
Lines 1053-1059 Link Here
1053	if (opts.isEmpty()) {	1061	if (opts.isEmpty()) {
1054	excCDBRecordNotFound (driver);	1062	excCDBRecordNotFound (driver);
1055	qError (errorString(),EXC_CDBRECORDNOTFOUND);	1063	qError (errorString(),EXC_CDBRECORDNOTFOUND);
1056	return Q3Dict<QString>();	1064	Q3Dict<QString>* nope = new Q3Dict<QString>;
		1065	return *nope;
1057	}	1066	}
1058	mCDBTabletOptions = *opts.at(0);	1067	mCDBTabletOptions = *opts.at(0);
1059	return mCDBTabletOptions;	1068	return mCDBTabletOptions;
Lines 1551-1557 Link Here
1551	//! separated by a semi-colon	1560	//! separated by a semi-colon
1552	// ----	1561	// ----
1553	if (! mImport) {	1562	if (! mImport) {
1554	return QString();	1563	QString* nope = new QString;
		1564	return *nope;
1555	}	1565	}
1556	QString name = mImport -> getItem ("Name");	1566	QString name = mImport -> getItem ("Name");
1557	QStringList vnlist = QStringList::split ( ";", name );	1567	QStringList vnlist = QStringList::split ( ";", name );
Lines 1568-1574 Link Here
1568	//! separated by a semi-colon	1578	//! separated by a semi-colon
1569	// ----	1579	// ----
1570	if (! mImport) {	1580	if (! mImport) {
1571	return QString();	1581	QString* nope = new QString;
		1582	return *nope;
1572	}	1583	}
1573	QString name = mImport -> getItem ("Name");	1584	QString name = mImport -> getItem ("Name");
1574	QStringList vnlist = QStringList::split ( ";", name );	1585	QStringList vnlist = QStringList::split ( ";", name );
Lines 1585-1591 Link Here
1585	//! is handled with the same key: TabletType	1596	//! is handled with the same key: TabletType
1586	// ----	1597	// ----
1587	if (! mImport) {	1598	if (! mImport) {
1588	return QString();	1599	QString* nope = new QString;
		1600	return *nope;
1589	}	1601	}
1590	return mImport -> getItem ("TabletType");	1602	return mImport -> getItem ("TabletType");
1591	}	1603	}

Lines 115-121 Link Here

(-)libsax/storage.cpp (-2 / +4 lines)
115	//! to the current data record	115	//! to the current data record
116	// ----	116	// ----
117	if (! mData.at (mCurrentID) -> operator[] (key)) {	117	if (! mData.at (mCurrentID) -> operator[] (key)) {
118	return QString();	118	QString* nope = new QString;
		119	return *nope;
119	}	120	}
120	return *mData.at (mCurrentID) -> operator[] (key);	121	return *mData.at (mCurrentID) -> operator[] (key);
121	}	122	}
Lines 386-392 Link Here
386	if (mData.at (id)) {	387	if (mData.at (id)) {
387	return *mData.at (id);	388	return *mData.at (id);
388	} else {	389	} else {
389	return Q3Dict<QString>();	390	Q3Dict<QString>* nope = new Q3Dict<QString>;
		391	return *nope;
390	}	392	}
391	}	393	}
392		394

Lines 284-290 Link Here

(-)libsax/desktop.cpp (-24 / +48 lines)
284	//! method will return an empty QString	284	//! method will return an empty QString
285	// ----	285	// ----
286	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	286	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
287	return QString();	287	QString* nope = new QString;
		288	return *nope;
288	}	289	}
289	//===================================	290	//===================================
290	// Check SaXMeta data...	291	// Check SaXMeta data...
Lines 311-317 Link Here
311	SaXImportSysp* pCard = new SaXImportSysp (SYSP_CARD);	312	SaXImportSysp* pCard = new SaXImportSysp (SYSP_CARD);
312	pCard -> doImport();	313	pCard -> doImport();
313	if (! pCard -> setID ( mDesktopID )) {	314	if (! pCard -> setID ( mDesktopID )) {
314	return QString();	315	QString* nope = new QString;
		316	return *nope;
315	}	317	}
316	QString mCardName;	318	QString mCardName;
317	QTextOStream (&mCardName) <<	319	QTextOStream (&mCardName) <<
Lines 351-357 Link Here
351	//------------------------------------	353	//------------------------------------
352	excEmptyCDBGroup ( mCardName.latin1() );	354	excEmptyCDBGroup ( mCardName.latin1() );
353	qError (errorString(),EXC_EMPTYCDBGROUP);	355	qError (errorString(),EXC_EMPTYCDBGROUP);
354	return QString();	356	QString* nope = new QString;
		357	return *nope;
355	}	358	}
356		359
357	//====================================	360	//====================================
Lines 933-945 Link Here
933	//! color an empty list is returned	936	//! color an empty list is returned
934	// ----	937	// ----
935	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	938	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
936	return QList<QString>();	939	QList<QString>* nope = new QList<QString>;
		940	return *nope;
937	}	941	}
938	QString modes;	942	QString modes;
939	modes.sprintf ("Modes:%d",color);	943	modes.sprintf ("Modes:%d",color);
940	QString resolutions = mDesktop -> getItem (modes);	944	QString resolutions = mDesktop -> getItem (modes);
941	if (resolutions.isEmpty()) {	945	if (resolutions.isEmpty()) {
942	return QList<QString>();	946	QList<QString>* nope = new QList<QString>;
		947	return *nope;
943	}	948	}
944	QList<QString> result;	949	QList<QString> result;
945	QStringList resList = QStringList::split ( ",", resolutions );	950	QStringList resList = QStringList::split ( ",", resolutions );
Lines 960-966 Link Here
960	//! the resolution	965	//! the resolution
961	// ----	966	// ----
962	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	967	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
963	return QList<QString>();	968	QList<QString>* nope = new QList<QString>;
		969	return *nope;
964	}	970	}
965	QList<QString> defaultList;	971	QList<QString> defaultList;
966	defaultList.append (QString("800x600"));	972	defaultList.append (QString("800x600"));
Lines 1056-1065 Link Here
1056	desktop -> setID ( mDesktopID );	1062	desktop -> setID ( mDesktopID );
1057	desktop -> doImport ();	1063	desktop -> doImport ();
1058	if ( desktop->getItem(key).isNull()) {	1064	if ( desktop->getItem(key).isNull()) {
1059	return QList<QString>();	1065	QList<QString>* nope = new QList<QString>;
		1066	return *nope;
1060	}	1067	}
1061	if ((key != "FBBoot") && (desktop->getItem("DDC") == "<undefined>")) {	1068	if ((key != "FBBoot") && (desktop->getItem("DDC") == "<undefined>")) {
1062	return QList<QString>();	1069	QList<QString>* nope = new QList<QString>;
		1070	return *nope;
1063	}	1071	}
1064	QString val = desktop->getItem(key);	1072	QString val = desktop->getItem(key);
1065	QStringList items = QStringList::split ( ",", val );	1073	QStringList items = QStringList::split ( ",", val );
Lines 1119-1129 Link Here
1119	//! returned	1127	//! returned
1120	// ----	1128	// ----
1121	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1129	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1122	return QList<QString>();	1130	QList<QString>* nope = new QList<QString>;
		1131	return *nope;
1123	}	1132	}
1124	QString size = mDesktop -> getItem ("DisplaySize");	1133	QString size = mDesktop -> getItem ("DisplaySize");
1125	if (size.isEmpty()) {	1134	if (size.isEmpty()) {
1126	return QList<QString>();	1135	QList<QString>* nope = new QList<QString>;
		1136	return *nope;
1127	}	1137	}
1128	QList<QString> result;	1138	QList<QString> result;
1129	QStringList sizeList = QStringList::split ( " ", size );	1139	QStringList sizeList = QStringList::split ( " ", size );
Lines 1145-1155 Link Here
1145	//! from the getDisplaySize() method	1155	//! from the getDisplaySize() method
1146	// ----	1156	// ----
1147	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1157	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1148	return QString();	1158	QString* nope = new QString;
		1159	return *nope;
1149	}	1160	}
1150	QList<QString> size = getDisplaySize();	1161	QList<QString> size = getDisplaySize();
1151	if (size.isEmpty()) {	1162	if (size.isEmpty()) {
1152	return QString();	1163	QString* nope = new QString;
		1164	return *nope;
1153	}	1165	}
1154	int x = size.at(0).toInt();	1166	int x = size.at(0).toInt();
1155	int y = size.at(1).toInt();	1167	int y = size.at(1).toInt();
Lines 1168-1181 Link Here
1168	//! information from the getDisplaySize() method	1180	//! information from the getDisplaySize() method
1169	// ----	1181	// ----
1170	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1182	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1171	return QList<QString>();	1183	QList<QString>* nope = new QList<QString>;
		1184	return *nope;
1172	}	1185	}
1173	QString* setX = new QString ("4");	1186	QString* setX = new QString ("4");
1174	QString* setY = new QString ("3");	1187	QString* setY = new QString ("3");
1175	QList<QString> result;	1188	QList<QString> result;
1176	QList<QString> size = getDisplaySize();	1189	QList<QString> size = getDisplaySize();
1177	if (size.isEmpty()) {	1190	if (size.isEmpty()) {
1178	return QList<QString>();	1191	QList<QString>* nope = new QList<QString>;
		1192	return *nope;
1179	}	1193	}
1180	int x = size.at(0).toInt();	1194	int x = size.at(0).toInt();
1181	int y = size.at(1).toInt();	1195	int y = size.at(1).toInt();
Lines 1205-1215 Link Here
1205	//! value specify the end of the range	1219	//! value specify the end of the range
1206	// ----	1220	// ----
1207	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1221	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1208	return QList<QString>();	1222	QList<QString>* nope = new QList<QString>;
		1223	return *nope;
1209	}	1224	}
1210	QString range = mDesktop -> getItem ("HorizSync");	1225	QString range = mDesktop -> getItem ("HorizSync");
1211	if (range.isEmpty()) {	1226	if (range.isEmpty()) {
1212	return QList<QString>();	1227	QList<QString>* nope = new QList<QString>;
		1228	return *nope;
1213	}	1229	}
1214	QList<QString> result;	1230	QList<QString> result;
1215	QStringList rangeList = QStringList::split ( "-", range );	1231	QStringList rangeList = QStringList::split ( "-", range );
Lines 1232-1242 Link Here
1232	//! value specify the end of the range	1248	//! value specify the end of the range
1233	// ----	1249	// ----
1234	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1250	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1235	return QList<QString>();	1251	QList<QString>* nope = new QList<QString>;
		1252	return *nope;
1236	}	1253	}
1237	QString range = mDesktop -> getItem ("VertRefresh");	1254	QString range = mDesktop -> getItem ("VertRefresh");
1238	if (range.isEmpty()) {	1255	if (range.isEmpty()) {
1239	return QList<QString>();	1256	QList<QString>* nope = new QList<QString>;
		1257	return *nope;
1240	}	1258	}
1241	QList<QString> result;	1259	QList<QString> result;
1242	QStringList rangeList = QStringList::split ( "-", range );	1260	QStringList rangeList = QStringList::split ( "-", range );
Lines 1277-1283 Link Here
1277	//! currently selected desktop	1295	//! currently selected desktop
1278	// ----	1296	// ----
1279	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1297	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1280	return QString();	1298	QString* nope = new QString;
		1299	return *nope;
1281	}	1300	}
1282	return mDesktop -> getItem ("VendorName");	1301	return mDesktop -> getItem ("VendorName");
1283	}	1302	}
Lines 1291-1297 Link Here
1291	//! currently selected desktop	1310	//! currently selected desktop
1292	// ----	1311	// ----
1293	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1312	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1294	return QString();	1313	QString* nope = new QString;
		1314	return *nope;
1295	}	1315	}
1296	return mDesktop -> getItem ("ModelName");	1316	return mDesktop -> getItem ("ModelName");
1297	}	1317	}
Lines 1305-1311 Link Here
1305	//! the active desktop	1325	//! the active desktop
1306	// ----	1326	// ----
1307	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1327	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1308	return QString();	1328	QString* nope = new QString;
		1329	return *nope;
1309	}	1330	}
1310	return mDesktop -> getItem ("ColorDepth");	1331	return mDesktop -> getItem ("ColorDepth");
1311	}	1332	}
Lines 1318-1324 Link Here
1318	//! get the currently used modeline algorithm method	1339	//! get the currently used modeline algorithm method
1319	// ----	1340	// ----
1320	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1341	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1321	return QString();	1342	QString* nope = new QString;
		1343	return *nope;
1322	}	1344	}
1323	return mDesktop -> getItem ("CalcAlgorithm");	1345	return mDesktop -> getItem ("CalcAlgorithm");
1324	}	1346	}
Lines 1351-1364 Link Here
1351	//! string is returned	1373	//! string is returned
1352	// ----	1374	// ----
1353	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {	1375	if ((! mDesktop) \|\| (! mCard) \|\| (! mPath)) {
1354	return QString();	1376	QString* nope = new QString;
		1377	return *nope;
1355	}	1378	}
1356	QString key;	1379	QString key;
1357	QString val;	1380	QString val;
1358	key.sprintf ("Virtual:%d",color);	1381	key.sprintf ("Virtual:%d",color);
1359	val = mDesktop -> getItem (key);	1382	val = mDesktop -> getItem (key);
1360	if (val.isEmpty()) {	1383	if (val.isEmpty()) {
1361	return QString();	1384	QString* nope = new QString;
		1385	return *nope;
1362	}	1386	}
1363	QStringList resList = QStringList::split ( " ", val );	1387	QStringList resList = QStringList::split ( " ", val );
1364	QString result (resList.join("x"));	1388	QString result (resList.join("x"));

Lines 214-220 Link Here

(-)libsax/path.cpp (-4 / +8 lines)
214	//! this X11 configuration	214	//! this X11 configuration
215	// ----	215	// ----
216	if (! mImport) {	216	if (! mImport) {
217	return QList<QString>();	217	QList<QString>* nope = new QList<QString>;
		218	return *nope;
218	}	219	}
219	QString paths = mImport -> getItem ("FontPath");	220	QString paths = mImport -> getItem ("FontPath");
220	return createList (paths);	221	return createList (paths);
Lines 229-235 Link Here
229	//! X11 configuration	230	//! X11 configuration
230	// ----	231	// ----
231	if (! mImport) {	232	if (! mImport) {
232	return QList<QString>();	233	QList<QString>* nope = new QList<QString>;
		234	return *nope;
233	}	235	}
234	QString modules = mImport -> getItem ("ModuleLoad");	236	QString modules = mImport -> getItem ("ModuleLoad");
235	return createList (modules);	237	return createList (modules);
Lines 244-250 Link Here
244	//! X11 configuration	246	//! X11 configuration
245	// ----	247	// ----
246	if (! mImport) {	248	if (! mImport) {
247	return QList<QString>();	249	QList<QString>* nope = new QList<QString>;
		250	return *nope;
248	}	251	}
249	QString modules = mImport -> getItem ("ServerFlags");	252	QString modules = mImport -> getItem ("ServerFlags");
250	return createList (modules);	253	return createList (modules);
Lines 259-265 Link Here
259	//! empty items will be ignored using this method	262	//! empty items will be ignored using this method
260	// ----	263	// ----
261	if (data.isEmpty()) {	264	if (data.isEmpty()) {
262	return QList<QString>();	265	QList<QString>* nope = new QList<QString>;
		266	return *nope;
263	}	267	}
264	QList<QString> result;	268	QList<QString> result;
265	QStringList dataList = QStringList::split ( ",", data );	269	QStringList dataList = QStringList::split ( ",", data );

Lines 113-119 Link Here

(-)libsax/keyboard.cpp (-10 / +20 lines)
113	//! given baselayout.	113	//! given baselayout.
114	// ----	114	// ----
115	if ( layout.isEmpty() \|\| ! getLayouts().find(layout) ) {	115	if ( layout.isEmpty() \|\| ! getLayouts().find(layout) ) {
116	return QList<QString>();	116	QList<QString>* nope = new QList<QString>;
		117	return *nope;
117	}	118	}
118	QList<QString> result1;	119	QList<QString> result1;
119	QStringList* r1 = mVarLists[layout];	120	QStringList* r1 = mVarLists[layout];
Lines 445-451 Link Here
445	//! return the driver used for this keyboard device	446	//! return the driver used for this keyboard device
446	// ----	447	// ----
447	if (! mImport) {	448	if (! mImport) {
448	return QString();	449	QString* nope = new QString;
		450	return *nope;
449	}	451	}
450	return mImport -> getItem ("Driver");	452	return mImport -> getItem ("Driver");
451	}	453	}
Lines 458-464 Link Here
458	//! return a list of XKB options set for the core keyboard	460	//! return a list of XKB options set for the core keyboard
459	// ----	461	// ----
460	if (! mImport) {	462	if (! mImport) {
461	return QList<QString>();	463	QList<QString>* nope = new QList<QString>;
		464	return *nope;
462	}	465	}
463	QString options = mImport -> getItem ("XkbOptions");	466	QString options = mImport -> getItem ("XkbOptions");
464	return createList (options);	467	return createList (options);
Lines 473-479 Link Here
473	//! the first element of the list os the core layout	476	//! the first element of the list os the core layout
474	// ----	477	// ----
475	if (! mImport) {	478	if (! mImport) {
476	return QList<QString>();	479	QList<QString>* nope = new QList<QString>;
		480	return *nope;
477	}	481	}
478	QString layouts = mImport -> getItem ("XkbLayout");	482	QString layouts = mImport -> getItem ("XkbLayout");
479	return createList (layouts);	483	return createList (layouts);
Lines 488-494 Link Here
488	//! defined keyboard layouts	492	//! defined keyboard layouts
489	// ----	493	// ----
490	if (! mImport) {	494	if (! mImport) {
491	return QList<QString>();	495	QList<QString>* nope = new QList<QString>;
		496	return *nope;
492	}	497	}
493	QString variants = mImport -> getItem ("XkbVariant");	498	QString variants = mImport -> getItem ("XkbVariant");
494	return createList (variants);	499	return createList (variants);
Lines 505-517 Link Here
505	//! be throwed and an empty string is returned	510	//! be throwed and an empty string is returned
506	// ----	511	// ----
507	if (! mImport) {	512	if (! mImport) {
508	return QString();	513	QString* nope = new QString;
		514	return *nope;
509	}	515	}
510	int layoutCount = findLayout (layout);	516	int layoutCount = findLayout (layout);
511	if (layoutCount < 0) {	517	if (layoutCount < 0) {
512	excXKBLayoutUndefined (layout);	518	excXKBLayoutUndefined (layout);
513	qError (errorString(),EXC_XKBLAYOUTUNDEFINED);	519	qError (errorString(),EXC_XKBLAYOUTUNDEFINED);
514	return QString();	520	QString* nope = new QString;
		521	return *nope;
515	}	522	}
516	int varCount = 0;	523	int varCount = 0;
517	QList<QString> vList = getXKBVariantList();	524	QList<QString> vList = getXKBVariantList();
Lines 522-528 Link Here
522	}	529	}
523	varCount++;	530	varCount++;
524	}	531	}
525	return QString();	532	QString* nope = new QString;
		533	return *nope;
526	}	534	}
527		535
528	//====================================	536	//====================================
Lines 534-540 Link Here
534	//! keyboard. Only one model can be defined and active	542	//! keyboard. Only one model can be defined and active
535	// ----	543	// ----
536	if (! mImport) {	544	if (! mImport) {
537	return QString();	545	QString* nope = new QString;
		546	return *nope;
538	}	547	}
539	return mImport -> getItem ("XkbModel");	548	return mImport -> getItem ("XkbModel");
540	}	549	}
Lines 574-580 Link Here
574	//! empty items (,,) are allowed using this method	583	//! empty items (,,) are allowed using this method
575	// ----	584	// ----
576	if (data.isEmpty()) {	585	if (data.isEmpty()) {
577	return QList<QString>();	586	QList<QString>* nope = new QList<QString>;
		587	return *nope;
578	}	588	}
579	QList<QString> result;	589	QList<QString> result;
580	QStringList dataList = QStringList::split ( ",", data, true );	590	QStringList dataList = QStringList::split ( ",", data, true );

Lines 280-286 Link Here

(-)libsax/layout.cpp (-3 / +6 lines)
280	// ----	280	// ----
281	SaXManipulateCard cardData (mCard);	281	SaXManipulateCard cardData (mCard);
282	if (! cardData.selectCard (screen)) {	282	if (! cardData.selectCard (screen)) {
283	return QList<QString> ();	283	QList<QString>* nope = new QList<QString>;
		284	return *nope;
284	}	285	}
285	QString idString; idString.sprintf ("%d",screen);	286	QString idString; idString.sprintf ("%d",screen);
286	QString layout = mLayout -> getItem (	287	QString layout = mLayout -> getItem (
Lines 289-295 Link Here
289	if (layout.isEmpty()) {	290	if (layout.isEmpty()) {
290	excGetScreenLayoutFailed (screen);	291	excGetScreenLayoutFailed (screen);
291	qError (errorString(),EXC_GETSCREENLAYOUTFAILED);	292	qError (errorString(),EXC_GETSCREENLAYOUTFAILED);
292	return QList<QString> ();	293	QList<QString>* nope = new QList<QString>;
		294	return *nope;
293	}	295	}
294	QList<QString> layoutList;	296	QList<QString> layoutList;
295	QStringList positions = QStringList::split ( " ", layout );	297	QStringList positions = QStringList::split ( " ", layout );
Lines 311-317 Link Here
311	if (layout.isEmpty()) {	313	if (layout.isEmpty()) {
312	excGetInputLayoutFailed ();	314	excGetInputLayoutFailed ();
313	qError (errorString(),EXC_GETINPUTLAYOUTFAILED);	315	qError (errorString(),EXC_GETINPUTLAYOUTFAILED);
314	return QList<QString> ();	316	QList<QString>* nope = new QList<QString>;
		317	return *nope;
315	}	318	}
316	QList<QString> inputList;	319	QList<QString> inputList;
317	QStringList tokens = QStringList::split ( ",", layout );	320	QStringList tokens = QStringList::split ( ",", layout );

Lines 491-497 Link Here

(-)libsax/config.cpp (-2 / +4 lines)
491	//! error occured an empty string is returned	491	//! error occured an empty string is returned
492	// ----	492	// ----
493	if (mParseErrorValue->isEmpty()) {	493	if (mParseErrorValue->isEmpty()) {
494	return QString("");	494	QString* nope = new QString("");
		495	return *nope;
495	}	496	}
496	return *mParseErrorValue;	497	return *mParseErrorValue;
497	}	498	}
Lines 505-511 Link Here
505	//! error occured an empty string is returned	506	//! error occured an empty string is returned
506	// ----	507	// ----
507	if (mParseErrorString->isEmpty()) {	508	if (mParseErrorString->isEmpty()) {
508	return QString("");	509	QString* nope = new QString("");
		510	return *nope;
509	}	511	}
510	return *mParseErrorString;	512	return *mParseErrorString;
511	}	513	}

Lines 265-271 Link Here

(-)libsax/card.cpp (-9 / +18 lines)
265	//! separated by a colon from the currently selected card	265	//! separated by a colon from the currently selected card
266	// ----	266	// ----
267	if (! mImport) {	267	if (! mImport) {
268	return QString();	268	QString* nope = new QString;
		269	return *nope;
269	}	270	}
270	//====================================	271	//====================================
271	// search name in SYSP data	272	// search name in SYSP data
Lines 296-302 Link Here
296	//! interface	297	//! interface
297	// ----	298	// ----
298	if (! mImport) {	299	if (! mImport) {
299	return QString();	300	QString* nope = new QString;
		301	return *nope;
300	}	302	}
301	//====================================	303	//====================================
302	// search vendor in SYSP data	304	// search vendor in SYSP data
Lines 321-327 Link Here
321	//! interface	323	//! interface
322	// ----	324	// ----
323	if (! mImport) {	325	if (! mImport) {
324	return QString();	326	QString* nope = new QString;
		327	return *nope;
325	}	328	}
326	//====================================	329	//====================================
327	// search model in SYSP data	330	// search model in SYSP data
Lines 346-352 Link Here
346	//! selected card	349	//! selected card
347	// ----	350	// ----
348	if (! mImport) {	351	if (! mImport) {
349	return QString();	352	QString* nope = new QString;
		353	return *nope;
350	}	354	}
351	return mImport -> getItem ("BusID");	355	return mImport -> getItem ("BusID");
352	}	356	}
Lines 360-366 Link Here
360	//! selected card	364	//! selected card
361	// ----	365	// ----
362	if (! mImport) {	366	if (! mImport) {
363	return QString();	367	QString* nope = new QString;
		368	return *nope;
364	}	369	}
365	return mImport -> getItem ("Driver");	370	return mImport -> getItem ("Driver");
366	}	371	}
Lines 374-380 Link Here
374	//! selected card. This value is always 0 for non multihead cards	379	//! selected card. This value is always 0 for non multihead cards
375	// ----	380	// ----
376	if (! mImport) {	381	if (! mImport) {
377	return QString();	382	QString* nope = new QString;
		383	return *nope;
378	}	384	}
379	return mImport -> getItem ("Screen");	385	return mImport -> getItem ("Screen");
380	}	386	}
Lines 389-395 Link Here
389	//! empty QString is returned	395	//! empty QString is returned
390	// ----	396	// ----
391	if (! mImport) {	397	if (! mImport) {
392	return QString();	398	QString* nope = new QString;
		399	return *nope;
393	}	400	}
394	return mImport -> getItem ("Rotate");	401	return mImport -> getItem ("Rotate");
395	}	402	}
Lines 406-412 Link Here
406	//! (bool options) the value for the key is the (null) string	413	//! (bool options) the value for the key is the (null) string
407	// ----	414	// ----
408	if (! mImport) {	415	if (! mImport) {
409	return Q3Dict<QString>();	416	Q3Dict<QString>* nope = new Q3Dict<QString>;
		417	return *nope;
410	}	418	}
411	Q3Dict<QString> result;	419	Q3Dict<QString> result;
412	QString stdOptions = mImport -> getItem ("Option");	420	QString stdOptions = mImport -> getItem ("Option");
Lines 489-495 Link Here
489	if (opts.isEmpty()) {	497	if (opts.isEmpty()) {
490	excCDBRecordNotFound (driver);	498	excCDBRecordNotFound (driver);
491	qError (errorString(),EXC_CDBRECORDNOTFOUND);	499	qError (errorString(),EXC_CDBRECORDNOTFOUND);
492	return Q3Dict<QString>();	500	Q3Dict<QString>* nope = new Q3Dict<QString>;
		501	return *nope;
493	}	502	}
494	Q3PtrList< Q3Dict<QString> > xaaopts;	503	Q3PtrList< Q3Dict<QString> > xaaopts;
495	xaaopts = mCDBCardModules -> getTablePointerCDB_DATA (	504	xaaopts = mCDBCardModules -> getTablePointerCDB_DATA (

Lines 141-147 Link Here

(-)api/tablet/tabletselection.cpp (-2 / +4 lines)
141	if (mVendorList->selectedItem()) {	141	if (mVendorList->selectedItem()) {
142	return mVendorList->selectedItem()->text();	142	return mVendorList->selectedItem()->text();
143	}	143	}
144	return QString();	144	QString* nope = new QString;
		145	return *nope;
145	}	146	}
146	//====================================	147	//====================================
147	// getModel	148	// getModel
Lines 150-156 Link Here
150	if (mModelList->selectedItem()) {	151	if (mModelList->selectedItem()) {
151	return mModelList->selectedItem()->text();	152	return mModelList->selectedItem()->text();
152	}	153	}
153	return QString();	154	QString* nope = new QString;
		155	return *nope;
154	}	156	}
155	//====================================	157	//====================================
156	// slotVendor	158	// slotVendor

Lines 268-274 Link Here

(-)api/touchscreen/touchselection.cpp (-2 / +4 lines)
268	if (mVendorList->selectedItem()) {	268	if (mVendorList->selectedItem()) {
269	return mVendorList->selectedItem()->text();	269	return mVendorList->selectedItem()->text();
270	}	270	}
271	return QString();	271	QString* nope = new QString;
		272	return *nope;
272	}	273	}
273	//====================================	274	//====================================
274	// getModel	275	// getModel
Lines 277-283 Link Here
277	if (mModelList->selectedItem()) {	278	if (mModelList->selectedItem()) {
278	return mModelList->selectedItem()->text();	279	return mModelList->selectedItem()->text();
279	}	280	}
280	return QString();	281	QString* nope = new QString;
		282	return *nope;
281	}	283	}
282	//====================================	284	//====================================
283	// getPortName	285	// getPortName