r15410 by craig - #9319: Fix some incorrect signals from Qt4 port
scribus-commit
scribus-commit at lists.scribus.net
Wed Aug 11 23:56:00 CEST 2010
Author: craig
Date: Wed Aug 11 21:56:00 2010
New Revision: 15410
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15410
Log:
#9319: Fix some incorrect signals from Qt4 port
Modified:
trunk/Scribus/scribus/ui/createrange.cpp
trunk/Scribus/scribus/ui/createrange.h
trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
trunk/Scribus/scribus/ui/tabcheckdoc.cpp
Modified: trunk/Scribus/scribus/ui/createrange.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15410&path=/trunk/Scribus/scribus/ui/createrange.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/createrange.cpp (original)
+++ trunk/Scribus/scribus/ui/createrange.cpp Wed Aug 11 21:56:00 2010
@@ -36,7 +36,7 @@
if (currText.length()>0)
basicRangeListBox->addItem(currText);
// signals and slots connections
- connect(tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT(selectRangeType(QWidget*)));
+ connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(selectRangeType(int)));
connect(basicRangeAddButton, SIGNAL(clicked()), this, SLOT(basicAddToRange()));
connect(basicRangeDelButton, SIGNAL(clicked()), this, SLOT(basicDelFromRange()));
connect(basicConsecutiveRadioButton, SIGNAL(clicked()), this, SLOT(basicSelectRangeTypeConsec()));
@@ -161,7 +161,7 @@
basicCommaSepLineEdit->setEnabled(!basicRangeTypeIsConsecutive);
}
-void CreateRange::selectRangeType(QWidget *)
+void CreateRange::selectRangeType(int)
{
m_RangeType=tabWidget->currentIndex();
}
Modified: trunk/Scribus/scribus/ui/createrange.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15410&path=/trunk/Scribus/scribus/ui/createrange.h
==============================================================================
--- trunk/Scribus/scribus/ui/createrange.h (original)
+++ trunk/Scribus/scribus/ui/createrange.h Wed Aug 11 21:56:00 2010
@@ -23,7 +23,7 @@
void getCreateRangeData(CreateRangeData&);
protected slots:
- void selectRangeType(QWidget *);
+ void selectRangeType(int);
void basicAddToRange();
void basicDelFromRange();
void basicMoveUp();
Modified: trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15410&path=/trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp Wed Aug 11 21:56:00 2010
@@ -200,7 +200,7 @@
currentProfileComboBox->clear();
disconnect(currentProfileComboBox, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- disconnect(currentProfileComboBox, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(currentProfileComboBox, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
CheckerPrefsList::Iterator it;
int j,i=0;
for (it = checkerProfile.begin(), j=0; it != checkerProfile.end(); ++it, ++j)
@@ -211,14 +211,14 @@
}
currentProfileComboBox->setCurrentIndex(i);
connect(currentProfileComboBox, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- connect(currentProfileComboBox, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ connect(currentProfileComboBox, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
tempNewProfileName="";
}
void Prefs_PreflightVerifier::delProf()
{
disconnect(currentProfileComboBox, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- disconnect(currentProfileComboBox, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(currentProfileComboBox, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
checkerProfile.remove(currentProfile);
updateProfile(checkerProfile.begin().key());
currentProfileComboBox->clear();
@@ -228,7 +228,7 @@
currentProfileComboBox->addItem(it.key());
setCurrentComboItem(currentProfileComboBox, currentProfile);
connect(currentProfileComboBox, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- connect(currentProfileComboBox, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ connect(currentProfileComboBox, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
if (checkerProfile.count() == 1)
removeProfilePushButton->setEnabled(false);
}
Modified: trunk/Scribus/scribus/ui/tabcheckdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15410&path=/trunk/Scribus/scribus/ui/tabcheckdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabcheckdoc.cpp (original)
+++ trunk/Scribus/scribus/ui/tabcheckdoc.cpp Wed Aug 11 21:56:00 2010
@@ -272,7 +272,7 @@
curCheckProfile->clear();
disconnect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- disconnect(curCheckProfile, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(curCheckProfile, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
CheckerPrefsList::Iterator it;
int j,i=0;
for (it = checkerProfile.begin(), j=0; it != checkerProfile.end(); ++it, ++j)
@@ -283,14 +283,14 @@
}
curCheckProfile->setCurrentIndex(i);
connect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- connect(curCheckProfile, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ connect(curCheckProfile, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
tempNewProfileName="";
}
void TabCheckDoc::delProf()
{
disconnect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- disconnect(curCheckProfile, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(curCheckProfile, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
checkerProfile.remove(currentProfile);
updateProfile(checkerProfile.begin().key());
curCheckProfile->clear();
@@ -300,7 +300,7 @@
curCheckProfile->addItem(it.key());
setCurrentComboItem(curCheckProfile, currentProfile);
connect(curCheckProfile, SIGNAL(activated(const QString&)), this, SLOT(setProfile(const QString&)));
- connect(curCheckProfile, SIGNAL(textChanged(const QString&)), this, SLOT(setProfile(const QString&)));
+ connect(curCheckProfile, SIGNAL(editTextChanged(const QString&)), this, SLOT(setProfile(const QString&)));
if (checkerProfile.count() == 1)
removeProfile->setEnabled(false);
}
More information about the scribus-commit
mailing list